diff --git a/scripts/service/start-silver.sh b/scripts/service/start-silver.sh
index d9412ba0..ed7bbc33 100755
--- a/scripts/service/start-silver.sh
+++ b/scripts/service/start-silver.sh
@@ -22,25 +22,25 @@ CONFIG_FILE="${CONF_DIR}/silver.yaml"
 # ASCII Banner
 echo -e "${CYAN}"
 cat <<'EOF'
-                                                                                                
-                                                                                                
-   SSSSSSSSSSSSSSS   iiii  lllllll                                                              
- SS:::::::::::::::S i::::i l:::::l                                                              
-S:::::SSSSSS::::::S  iiii  l:::::l                                                              
-S:::::S     SSSSSSS        l:::::l                                                              
-S:::::S            iiiiiii  l::::lvvvvvvv           vvvvvvv eeeeeeeeeeee    rrrrr   rrrrrrrrr   
-S:::::S            i::::i  l::::l v:::::v         v:::::vee::::::::::::ee  r::::rrr:::::::::r  
- S::::SSSS          i::::i  l::::l  v:::::v       v:::::ve::::::eeeee:::::eer:::::::::::::::::r 
+
+
+   SSSSSSSSSSSSSSS   iiii  lllllll
+ SS:::::::::::::::S i::::i l:::::l
+S:::::SSSSSS::::::S  iiii  l:::::l
+S:::::S     SSSSSSS        l:::::l
+S:::::S            iiiiiii  l::::lvvvvvvv           vvvvvvv eeeeeeeeeeee    rrrrr   rrrrrrrrr
+S:::::S            i::::i  l::::l v:::::v         v:::::vee::::::::::::ee  r::::rrr:::::::::r
+ S::::SSSS          i::::i  l::::l  v:::::v       v:::::ve::::::eeeee:::::eer:::::::::::::::::r
   SS::::::SSSSS     i::::i  l::::l   v:::::v     v:::::ve::::::e     e:::::err::::::rrrrr::::::r
     SSS::::::::SS   i::::i  l::::l    v:::::v   v:::::v e:::::::eeeee::::::e r:::::r     r:::::r
        SSSSSS::::S  i::::i  l::::l     v:::::v v:::::v  e:::::::::::::::::e  r:::::r     rrrrrrr
-            S:::::S i::::i  l::::l      v:::::v:::::v   e::::::eeeeeeeeeee   r:::::r            
-            S:::::S i::::i  l::::l       v:::::::::v    e:::::::e            r:::::r            
-SSSSSSS     S:::::Si::::::il::::::l       v:::::::v     e::::::::e           r:::::r            
-S::::::SSSSSS:::::Si::::::il::::::l        v:::::v       e::::::::eeeeeeee   r:::::r            
-S:::::::::::::::SS i::::::il::::::l         v:::v         ee:::::::::::::e   r:::::r            
- SSSSSSSSSSSSSSS   iiiiiiiillllllll          vvv            eeeeeeeeeeeeee   rrrrrrr            
-                                                                                                 
+            S:::::S i::::i  l::::l      v:::::v:::::v   e::::::eeeeeeeeeee   r:::::r
+            S:::::S i::::i  l::::l       v:::::::::v    e:::::::e            r:::::r
+SSSSSSS     S:::::Si::::::il::::::l       v:::::::v     e::::::::e           r:::::r
+S::::::SSSSSS:::::Si::::::il::::::l        v:::::v       e::::::::eeeeeeee   r:::::r
+S:::::::::::::::SS i::::::il::::::l         v:::v         ee:::::::::::::e   r:::::r
+ SSSSSSSSSSSSSSS   iiiiiiiillllllll          vvv            eeeeeeeeeeeeee   rrrrrrr
+
 EOF
 echo -e "${NC}"
 
@@ -48,12 +48,10 @@ echo ""
 echo -e " 🚀 ${GREEN}Welcome to Silver Mail System Setup${NC}"
 echo "---------------------------------------------"
 
-MAIL_DOMAIN=""
-
 # ================================
 # Step 1: Domain Configuration
 # ================================
-echo -e "\n${YELLOW}Step 1/4: Configure domain name${NC}"
+echo -e "\n${YELLOW}Step 1/3: Configure domain name${NC}"
 
 # Extract primary (first) domain from the domains list in silver.yaml
 MAIL_DOMAIN=$(grep -m 1 '^\s*-\s*domain:' "$CONFIG_FILE" | sed 's/.*domain:\s*//' | xargs)
@@ -75,7 +73,7 @@ fi
 # ================================
 # Step 2: Ensure ${MAIL_DOMAIN} points to 127.0.0.1 in /etc/hosts
 # ================================
-echo -e "\n${YELLOW}Step 2/4: Updating ${MAIL_DOMAIN} mapping in /etc/hosts${NC}"
+echo -e "\n${YELLOW}Step 2/3: Updating ${MAIL_DOMAIN} mapping in /etc/hosts${NC}"
 
 if grep -q "[[:space:]]${MAIL_DOMAIN}" /etc/hosts; then
 	# Replace existing entry
@@ -90,7 +88,7 @@ fi
 # ================================
 # Step 3: Docker Setup
 # ================================
-echo -e "\n${YELLOW}Step 3/4: Starting Docker services${NC}"
+echo -e "\n${YELLOW}Step 3/3: Starting Docker services${NC}"
 
 # Check and setup SeaweedFS S3 configuration
 SEAWEEDFS_CONFIG="${SERVICES_DIR}/seaweedfs/s3-config.json"
@@ -125,58 +123,6 @@ if [ $? -ne 0 ]; then
 fi
 echo -e "${GREEN}  ✓ Silver mail services started${NC}"
 
-sleep 1 # Wait a bit for services to initialize
-
-# ================================
-# Step 4: Initialize Thunder User Schema
-# ================================
-
-THUNDER_HOST=${MAIL_DOMAIN}
-THUNDER_PORT=8090
-
-echo -e "\n${YELLOW}Step 4/4: Creating default user schema in Thunder${NC}"
-
-# Source Thunder authentication utility
-source "${SCRIPT_DIR}/../utils/thunder-auth.sh"
-
-# Step 4.1 & 4.2: Authenticate with Thunder
-if ! thunder_authenticate "$THUNDER_HOST" "$THUNDER_PORT"; then
-	exit 1
-fi
-
-# Step 4.3: Create organization unit
-if ! thunder_create_org_unit "$THUNDER_HOST" "$THUNDER_PORT" "$BEARER_TOKEN" "silver" "Silver Mail" "Organization Unit for Silver Mail"; then
-	exit 1
-fi
-
-# Step 4.4: Create user schema
-echo "  - Creating user schema..."
-SCHEMA_RESPONSE=$(curl -s -w "\n%{http_code}" -X POST \
-	"https://${THUNDER_HOST}:${THUNDER_PORT}/user-schemas" \
-	-H "Content-Type: application/json" \
-	-H "Accept: application/json" \
-	-H "Authorization: Bearer ${BEARER_TOKEN}" \
-	-d "{
-    \"name\": \"emailuser\",
-    \"ouId\": \"${ORG_UNIT_ID}\",
-    \"schema\": {
-      \"username\": { \"type\": \"string\", \"unique\": true },
-      \"password\": { \"type\": \"string\" },
-      \"email\": { \"type\": \"string\", \"unique\": true }
-    }
-  }")
-
-SCHEMA_BODY=$(echo "$SCHEMA_RESPONSE" | head -n -1)
-SCHEMA_STATUS=$(echo "$SCHEMA_RESPONSE" | tail -n1)
-
-if [ "$SCHEMA_STATUS" -eq 201 ] || [ "$SCHEMA_STATUS" -eq 200 ]; then
-	echo -e "${GREEN}  ✓ User schema 'emailuser' created successfully (HTTP $SCHEMA_STATUS)${NC}"
-else
-	echo -e "${RED}✗ Failed to create user schema (HTTP $SCHEMA_STATUS)${NC}"
-	echo "Response: $SCHEMA_BODY"
-	exit 1
-fi
-
 # ================================
 # Public DKIM Key Instructions
 # ================================
diff --git a/scripts/setup/setup.sh b/scripts/setup/setup.sh
index 26810946..2f4cdda7 100644
--- a/scripts/setup/setup.sh
+++ b/scripts/setup/setup.sh
@@ -24,25 +24,25 @@ readonly SILVER_CONFIG=$(grep -m 1 '^config-url:' "${CONFIG_FILE}" | sed 's/conf
 # ASCII Banner
 echo -e "${CYAN}"
 cat <<'EOF'
-                                                                                                
-                                                                                                
-   SSSSSSSSSSSSSSS   iiii  lllllll                                                              
- SS:::::::::::::::S i::::i l:::::l                                                              
-S:::::SSSSSS::::::S  iiii  l:::::l                                                              
-S:::::S     SSSSSSS        l:::::l                                                              
-S:::::S            iiiiiii  l::::lvvvvvvv           vvvvvvv eeeeeeeeeeee    rrrrr   rrrrrrrrr   
-S:::::S            i::::i  l::::l v:::::v         v:::::vee::::::::::::ee  r::::rrr:::::::::r  
- S::::SSSS          i::::i  l::::l  v:::::v       v:::::ve::::::eeeee:::::eer:::::::::::::::::r 
+
+
+   SSSSSSSSSSSSSSS   iiii  lllllll
+ SS:::::::::::::::S i::::i l:::::l
+S:::::SSSSSS::::::S  iiii  l:::::l
+S:::::S     SSSSSSS        l:::::l
+S:::::S            iiiiiii  l::::lvvvvvvv           vvvvvvv eeeeeeeeeeee    rrrrr   rrrrrrrrr
+S:::::S            i::::i  l::::l v:::::v         v:::::vee::::::::::::ee  r::::rrr:::::::::r
+ S::::SSSS          i::::i  l::::l  v:::::v       v:::::ve::::::eeeee:::::eer:::::::::::::::::r
   SS::::::SSSSS     i::::i  l::::l   v:::::v     v:::::ve::::::e     e:::::err::::::rrrrr::::::r
     SSS::::::::SS   i::::i  l::::l    v:::::v   v:::::v e:::::::eeeee::::::e r:::::r     r:::::r
        SSSSSS::::S  i::::i  l::::l     v:::::v v:::::v  e:::::::::::::::::e  r:::::r     rrrrrrr
-            S:::::S i::::i  l::::l      v:::::v:::::v   e::::::eeeeeeeeeee   r:::::r            
-            S:::::S i::::i  l::::l       v:::::::::v    e:::::::e            r:::::r            
-SSSSSSS     S:::::Si::::::il::::::l       v:::::::v     e::::::::e           r:::::r            
-S::::::SSSSSS:::::Si::::::il::::::l        v:::::v       e::::::::eeeeeeee   r:::::r            
-S:::::::::::::::SS i::::::il::::::l         v:::v         ee:::::::::::::e   r:::::r            
- SSSSSSSSSSSSSSS   iiiiiiiillllllll          vvv            eeeeeeeeeeeeee   rrrrrrr            
-                                                                                                 
+            S:::::S i::::i  l::::l      v:::::v:::::v   e::::::eeeeeeeeeee   r:::::r
+            S:::::S i::::i  l::::l       v:::::::::v    e:::::::e            r:::::r
+SSSSSSS     S:::::Si::::::il::::::l       v:::::::v     e::::::::e           r:::::r
+S::::::SSSSSS:::::Si::::::il::::::l        v:::::v       e::::::::eeeeeeee   r:::::r
+S:::::::::::::::SS i::::::il::::::l         v:::v         ee:::::::::::::e   r:::::r
+ SSSSSSSSSSSSSSS   iiiiiiiillllllll          vvv            eeeeeeeeeeeeee   rrrrrrr
+
 EOF
 echo -e "${NC}"
 
diff --git a/scripts/user/add_user.sh b/scripts/user/add_user.sh
deleted file mode 100755
index cd73258e..00000000
--- a/scripts/user/add_user.sh
+++ /dev/null
@@ -1,652 +0,0 @@
-#!/bin/bash
-
-# ============================================
-#  Silver Mail - Add Users from users.yaml + Thunder Initialization
-# ============================================
-
-# -------------------------------
-# Configuration
-# -------------------------------
-# Colors
-CYAN="\033[0;36m"
-GREEN="\033[0;32m"
-YELLOW="\033[1;33m"
-RED="\033[0;31m"
-BLUE="\033[0;34m"
-NC="\033[0m" # No Color
-
-# Directories & files
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# Services directory contains docker-compose.yaml and silver-config
-SERVICES_DIR="$(cd "${SCRIPT_DIR}/../../services" && pwd)"
-# Conf directory contains config files
-CONF_DIR="$(cd "${SCRIPT_DIR}/../../conf" && pwd)"
-CONFIG_FILE="${CONF_DIR}/silver.yaml"
-USERS_FILE="${CONF_DIR}/users.yaml"
-INVITE_URLS_DIR="${SCRIPT_DIR}/../../scripts/user"
-INVITE_URLS_FILE="${INVITE_URLS_DIR}/user_invite_urls.txt"
-
-echo -e "${CYAN}---------------------------------------------${NC}"
-echo -e " 🚀 ${GREEN}Silver Mail - Bulk Add Users${NC}"
-echo -e "${CYAN}---------------------------------------------${NC}\n"
-
-# -------------------------------
-# Helper Functions
-# -------------------------------
-
-# Make a Thunder API call and parse response
-# Usage: thunder_api_call <url> <json_data> <description>
-# Sets global variables: API_RESPONSE_BODY and API_RESPONSE_STATUS
-thunder_api_call() {
-	local url="$1"
-	local json_data="$2"
-	local description="$3"
-	
-	local full_response=$(curl -s -w "\n%{http_code}" -X POST \
-		-H "Content-Type: application/json" \
-		-H "Accept: application/json" \
-		-H "Authorization: Bearer ${BEARER_TOKEN}" \
-		"$url" \
-		-d "$json_data")
-	
-	API_RESPONSE_BODY=$(echo "$full_response" | head -n -1)
-	API_RESPONSE_STATUS=$(echo "$full_response" | tail -n1)
-	
-	if [ "$API_RESPONSE_STATUS" -ne 200 ]; then
-		echo -e "${RED}✗ Failed to $description (HTTP $API_RESPONSE_STATUS)${NC}"
-		echo -e "${RED}Response: $API_RESPONSE_BODY${NC}"
-		return 1
-	fi
-	
-	return 0
-}
-
-# Check if Docker Compose services are running
-check_services() {
-	echo -e "${YELLOW}Checking Docker Compose services...${NC}"
-
-	if ! (cd "${SERVICES_DIR}" && docker compose ps smtp-server) | grep -q "Up\|running"; then
-		echo -e "${RED}✗ SMTP server container is not running${NC}"
-		echo -e "${YELLOW}Starting services with: docker compose up -d${NC}"
-		(cd "${SERVICES_DIR}" && docker compose up -d)
-		sleep 10
-	else
-		echo -e "${GREEN}✓ SMTP server container is running${NC}"
-	fi
-}
-
-# Add user to SQLite database
-update_container_virtual_users() {
-	local smtp_container="$1"
-	local user_email="$2"
-	local username="$3"
-	local mail_domain="$4"
-
-	echo -e "${YELLOW}Adding $user_email to SQLite database...${NC}"
-
-	docker exec "$smtp_container" bash -c "
-        DB_PATH='/app/data/databases/shared.db'
-
-        # Get domain_id
-        domain_id=\$(sqlite3 \"\$DB_PATH\" \"SELECT id FROM domains WHERE domain='${mail_domain}' AND enabled=1;\")
-
-        if [ -z \"\$domain_id\" ]; then
-            echo 'Error: Domain ${mail_domain} not found in database'
-            exit 1
-        fi
-
-        # Insert user into database
-        sqlite3 \"\$DB_PATH\" \"INSERT OR REPLACE INTO users (username, domain_id, enabled) VALUES ('${username}', \$domain_id, 1);\"
-
-        if [ \$? -eq 0 ]; then
-            echo 'User added to database successfully'
-        else
-            echo 'Failed to add user to database'
-            exit 1
-        fi
-    "
-}
-
-# Create role mailbox in SQLite database
-create_role_mailbox() {
-	local smtp_container="$1"
-	local role_name="$2"
-	local mail_domain="$3"
-	local role_email="${role_name}@${mail_domain}"
-
-	echo -e "${YELLOW}Creating role mailbox ${role_email}...${NC}"
-
-	docker exec "$smtp_container" bash -c "
-        DB_PATH='/app/data/databases/shared.db'
-
-        # Get domain_id
-        domain_id=\$(sqlite3 \"\$DB_PATH\" \"SELECT id FROM domains WHERE domain='${mail_domain}' AND enabled=1;\")
-
-        if [ -z \"\$domain_id\" ]; then
-            echo 'Error: Domain ${mail_domain} not found in database'
-            exit 1
-        fi
-
-        # Check if role already exists
-        role_exists=\$(sqlite3 \"\$DB_PATH\" \"SELECT COUNT(*) FROM role_mailboxes WHERE email='${role_email}';\")
-
-        if [ \"\$role_exists\" != \"0\" ]; then
-            echo 'Role mailbox ${role_email} already exists'
-            exit 0
-        fi
-
-        # Insert role mailbox into database
-        sqlite3 \"\$DB_PATH\" \"INSERT INTO role_mailboxes (email, domain_id, enabled, created_at) VALUES ('${role_email}', \$domain_id, 1, datetime('now'));\""
-
-	if [ $? -eq 0 ]; then
-		echo -e "${GREEN}✓ Role mailbox ${role_email} created successfully${NC}"
-		return 0
-	else
-		echo -e "${RED}✗ Failed to create role mailbox ${role_email}${NC}"
-		return 1
-	fi
-}
-
-# Assign user to role mailbox
-assign_user_to_role() {
-	local smtp_container="$1"
-	local username="$2"
-	local role_name="$3"
-	local mail_domain="$4"
-	local role_email="${role_name}@${mail_domain}"
-
-	echo -e "${YELLOW}Assigning ${username}@${mail_domain} to role ${role_email}...${NC}"
-
-	docker exec "$smtp_container" bash -c "
-        DB_PATH='/app/data/databases/shared.db'
-
-        # Get domain_id
-        domain_id=\$(sqlite3 \"\$DB_PATH\" \"SELECT id FROM domains WHERE domain='${mail_domain}' AND enabled=1;\")
-
-        if [ -z \"\$domain_id\" ]; then
-            echo 'Error: Domain ${mail_domain} not found in database'
-            exit 1
-        fi
-
-        # Get user_id
-        user_id=\$(sqlite3 \"\$DB_PATH\" \"SELECT id FROM users WHERE username='${username}' AND domain_id=\$domain_id AND enabled=1;\")
-
-        if [ -z \"\$user_id\" ]; then
-            echo 'Error: User ${username}@${mail_domain} not found in database'
-            exit 1
-        fi
-
-        # Get role_mailbox_id using email column
-        role_mailbox_id=\$(sqlite3 \"\$DB_PATH\" \"SELECT id FROM role_mailboxes WHERE email='${role_email}' AND enabled=1;\")
-
-        if [ -z \"\$role_mailbox_id\" ]; then
-            echo 'Error: Role ${role_email} not found in database'
-            exit 1
-        fi
-
-        # Check if assignment already exists
-        assignment_exists=\$(sqlite3 \"\$DB_PATH\" \"SELECT COUNT(*) FROM user_role_assignments WHERE user_id=\$user_id AND role_mailbox_id=\$role_mailbox_id;\")
-
-        if [ \"\$assignment_exists\" != \"0\" ]; then
-            echo 'User already assigned to this role'
-            exit 0
-        fi
-
-        # Create assignment
-        sqlite3 \"\$DB_PATH\" \"INSERT INTO user_role_assignments (user_id, role_mailbox_id, assigned_at, is_active) VALUES (\$user_id, \$role_mailbox_id, datetime('now'), 1);\""
-
-	if [ $? -eq 0 ]; then
-		echo -e "${GREEN}✓ User ${username}@${mail_domain} assigned to role ${role_email}${NC}"
-		return 0
-	else
-		echo -e "${RED}✗ Failed to assign user to role${NC}"
-		return 1
-	fi
-}
-
-# Check user count in container (from SQLite database)
-get_container_user_count() {
-	local smtp_container="$1"
-	local count=$(docker exec "$smtp_container" bash -c "sqlite3 /app/data/databases/shared.db 'SELECT COUNT(*) FROM users WHERE enabled=1;' 2>/dev/null || echo '0'" | tr -d '\n\r' | head -c 10)
-	echo ${count:-0}
-}
-
-# Maildir creation removed - using Raven IMAP server for mail storage
-
-# -------------------------------
-# Step 0: Validate config files exist
-# -------------------------------
-if [ ! -f "$CONFIG_FILE" ]; then
-	echo -e "${RED}✗ Configuration file not found: $CONFIG_FILE${NC}"
-	exit 1
-fi
-
-if [ ! -f "$USERS_FILE" ]; then
-	echo -e "${RED}✗ Users file not found: $USERS_FILE${NC}"
-	exit 1
-fi
-
-echo -e "${GREEN}✓ Configuration files found${NC}"
-
-# -------------------------------
-# Step 1: Check services and maximum user limit
-# -------------------------------
-check_services
-
-MAX_USERS=100
-
-# Find the smtp container
-SMTP_CONTAINER=$(cd "${SERVICES_DIR}" && docker compose ps -q smtp-server 2>/dev/null)
-if [ -z "$SMTP_CONTAINER" ]; then
-	echo -e "${RED}✗ SMTP container not found. Is Docker Compose running?${NC}"
-	echo -e "${YELLOW}Try running: docker compose up -d${NC}"
-	exit 1
-fi
-
-# Ensure SQLite database exists in container
-docker exec "$SMTP_CONTAINER" bash -c "
-    if [ ! -f /app/data/databases/shared.db ]; then
-        echo 'Error: Database does not exist at /app/data/databases/shared.db'
-        echo 'Please ensure raven-server is running and has created the database'
-        exit 1
-    fi
-"
-
-if [ $? -ne 0 ]; then
-	echo -e "${RED}✗ SQLite database not found. Please start raven-server first.${NC}"
-	exit 1
-fi
-
-# Helper function to ensure domain exists in database
-ensure_domain_exists() {
-	local domain="$1"
-	echo -e "${YELLOW}Ensuring domain ${domain} exists in database...${NC}"
-
-	DOMAIN_CHECK=$(docker exec "$SMTP_CONTAINER" bash -c "
-        sqlite3 /app/data/databases/shared.db \"SELECT COUNT(*) FROM domains WHERE domain='${domain}';\"
-    " 2>/dev/null | tr -d '\n\r')
-
-	if [ "$DOMAIN_CHECK" = "0" ]; then
-		echo -e "${YELLOW}Domain ${domain} not found. Adding to database...${NC}"
-		docker exec "$SMTP_CONTAINER" bash -c "
-            sqlite3 /app/data/databases/shared.db \"INSERT INTO domains (domain, enabled, created_at) VALUES ('${domain}', 1, datetime('now'));\"
-        "
-
-		if [ $? -eq 0 ]; then
-			echo -e "${GREEN}✓ Domain ${domain} added to database${NC}"
-		else
-			echo -e "${RED}✗ Failed to add domain to database${NC}"
-			return 1
-		fi
-	else
-		echo -e "${GREEN}✓ Domain ${domain} already exists in database${NC}"
-	fi
-	return 0
-}
-
-# Get current user count
-CURRENT_USER_COUNT=$(get_container_user_count "$SMTP_CONTAINER")
-CURRENT_USER_COUNT=${CURRENT_USER_COUNT:-0}
-echo -e "${CYAN}Current users: ${GREEN}$CURRENT_USER_COUNT${NC}. Maximum allowed: $MAX_USERS${NC}"
-
-# -------------------------------
-# Step 2: Extract primary domain for Thunder
-# -------------------------------
-# Get the first domain from users.yaml as primary domain for Thunder
-PRIMARY_DOMAIN=$(grep -m 1 '^\s*-\s*domain:' "$USERS_FILE" | sed 's/.*domain:\s*//' | xargs)
-
-if [ -z "$PRIMARY_DOMAIN" ]; then
-	echo -e "${RED}✗ No domains found in $USERS_FILE${NC}"
-	exit 1
-fi
-
-THUNDER_HOST=${PRIMARY_DOMAIN}
-THUNDER_PORT="8090"
-echo -e "${GREEN}✓ Thunder host set to: $THUNDER_HOST:$THUNDER_PORT (primary domain)${NC}"
-
-# -------------------------------
-# Step 2.1: Authenticate with Thunder and get organization unit
-# -------------------------------
-# Source Thunder authentication utility
-source "${SCRIPT_DIR}/../utils/thunder-auth.sh"
-
-# Authenticate with Thunder
-if ! thunder_authenticate "$THUNDER_HOST" "$THUNDER_PORT"; then
-	exit 1
-fi
-
-# Get organization unit ID for "silver"
-if ! thunder_get_org_unit "$THUNDER_HOST" "$THUNDER_PORT" "$BEARER_TOKEN" "silver"; then
-	exit 1
-fi
-
-# -------------------------------
-# Step 3: Validate users.yaml
-# -------------------------------
-YAML_USER_COUNT=$(grep -c "username:" "$USERS_FILE" 2>/dev/null || echo "0")
-if [ "$YAML_USER_COUNT" -eq 0 ]; then
-	echo -e "${RED}✗ No users defined in $USERS_FILE${NC}"
-	exit 1
-fi
-
-# Initialize invite URLs file
-mkdir -p "$INVITE_URLS_DIR"
-echo "# Silver Mail User Invite URLs - Generated on $(date)" >"$INVITE_URLS_FILE"
-echo "# Users must complete registration using these URLs to set their passwords" >>"$INVITE_URLS_FILE"
-echo "" >>"$INVITE_URLS_FILE"
-
-# -------------------------------
-# Step 4: Process domains and users
-# -------------------------------
-ADDED_COUNT=0
-ROLES_CREATED_COUNT=0
-ASSIGNMENTS_COUNT=0
-CURRENT_DOMAIN=""
-USER_USERNAME=""
-IN_USERS_SECTION=false
-IN_ROLES_SECTION=false
-CURRENT_ROLE_NAME=""
-IN_ASSIGNED_USERS_SECTION=false
-
-# Arrays to store roles and their assignments (processed after users)
-declare -A DOMAIN_ROLES        # domain -> list of role names
-declare -A ROLE_ASSIGNMENTS    # domain:role -> list of usernames
-
-while IFS= read -r line; do
-	trimmed_line=$(echo "$line" | sed 's/^[[:space:]]*//' | sed 's/[[:space:]]*$//')
-
-	# Match domain line: "- domain: example.com" or "  - domain: example.com"
-	if [[ $line =~ ^[[:space:]]*-[[:space:]]+domain:[[:space:]]+(.+)$ ]]; then
-		CURRENT_DOMAIN="${BASH_REMATCH[1]}"
-		CURRENT_DOMAIN=$(echo "$CURRENT_DOMAIN" | xargs)
-		IN_USERS_SECTION=false
-
-		if [ -n "$CURRENT_DOMAIN" ]; then
-			echo -e "\n${CYAN}========================================${NC}"
-			echo -e "${CYAN}Processing domain: ${GREEN}${CURRENT_DOMAIN}${NC}"
-			echo -e "${CYAN}========================================${NC}"
-
-			# Validate domain format
-			if ! [[ "$CURRENT_DOMAIN" =~ ^[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$ ]]; then
-				echo -e "${RED}✗ Invalid domain: $CURRENT_DOMAIN${NC}"
-				CURRENT_DOMAIN=""
-				continue
-			fi
-
-			# Ensure domain exists in database
-			if ! ensure_domain_exists "$CURRENT_DOMAIN"; then
-				echo -e "${RED}✗ Failed to set up domain $CURRENT_DOMAIN. Skipping.${NC}"
-				CURRENT_DOMAIN=""
-				continue
-			fi
-		fi
-	fi
-
-	# Match "roles:" section marker
-	if [[ $trimmed_line =~ ^roles:[[:space:]]*$ ]] && [ -n "$CURRENT_DOMAIN" ]; then
-		IN_ROLES_SECTION=true
-		IN_USERS_SECTION=false
-		continue
-	fi
-
-	# Match "users:" section marker
-	if [[ $trimmed_line =~ ^users:[[:space:]]*$ ]] && [ -n "$CURRENT_DOMAIN" ]; then
-		IN_USERS_SECTION=true
-		IN_ROLES_SECTION=false
-		continue
-	fi
-
-	# Process role definitions (in roles section)
-	if [ "$IN_ROLES_SECTION" = true ] && [ -n "$CURRENT_DOMAIN" ]; then
-		# Match role name: "- name: info" or "  - name: info"
-		if [[ $line =~ ^[[:space:]]+-[[:space:]]+name:[[:space:]]+(.+)$ ]]; then
-			CURRENT_ROLE_NAME="${BASH_REMATCH[1]}"
-			CURRENT_ROLE_NAME=$(echo "$CURRENT_ROLE_NAME" | xargs)
-			IN_ASSIGNED_USERS_SECTION=false
-
-			if [ -n "$CURRENT_ROLE_NAME" ]; then
-				# Store role for later processing
-				if [ -z "${DOMAIN_ROLES[$CURRENT_DOMAIN]}" ]; then
-					DOMAIN_ROLES[$CURRENT_DOMAIN]="$CURRENT_ROLE_NAME"
-				else
-					DOMAIN_ROLES[$CURRENT_DOMAIN]="${DOMAIN_ROLES[$CURRENT_DOMAIN]},$CURRENT_ROLE_NAME"
-				fi
-				echo -e "${CYAN}Found role: ${CURRENT_ROLE_NAME}@${CURRENT_DOMAIN}${NC}"
-			fi
-			continue
-		fi
-
-		# Match "assigned_users:" marker
-		if [[ $trimmed_line =~ ^assigned_users:[[:space:]]*$ ]] && [ -n "$CURRENT_ROLE_NAME" ]; then
-			IN_ASSIGNED_USERS_SECTION=true
-			continue
-		fi
-
-		# Match assigned usernames: "- alice" or "  - alice"
-		if [[ $line =~ ^[[:space:]]+-[[:space:]]+(.+)$ ]] && [ "$IN_ASSIGNED_USERS_SECTION" = true ] && [ -n "$CURRENT_ROLE_NAME" ]; then
-			ASSIGNED_USER="${BASH_REMATCH[1]}"
-			ASSIGNED_USER=$(echo "$ASSIGNED_USER" | xargs)
-
-			if [ -n "$ASSIGNED_USER" ]; then
-				# Store assignment for later processing
-				ROLE_KEY="${CURRENT_DOMAIN}:${CURRENT_ROLE_NAME}"
-				if [ -z "${ROLE_ASSIGNMENTS[$ROLE_KEY]}" ]; then
-					ROLE_ASSIGNMENTS[$ROLE_KEY]="$ASSIGNED_USER"
-				else
-					ROLE_ASSIGNMENTS[$ROLE_KEY]="${ROLE_ASSIGNMENTS[$ROLE_KEY]},$ASSIGNED_USER"
-				fi
-				echo -e "${CYAN}  → User ${ASSIGNED_USER} will be assigned to ${CURRENT_ROLE_NAME}@${CURRENT_DOMAIN}${NC}"
-			fi
-			continue
-		fi
-	fi
-
-	# Match username line: "- username: alice" or "  - username: alice"
-	if [[ $line =~ ^[[:space:]]+-[[:space:]]+username:[[:space:]]+(.+)$ ]] && [ "$IN_USERS_SECTION" = true ] && [ -n "$CURRENT_DOMAIN" ]; then
-		USER_USERNAME="${BASH_REMATCH[1]}"
-		USER_USERNAME=$(echo "$USER_USERNAME" | xargs)
-
-		if [ -n "$USER_USERNAME" ]; then
-			USER_EMAIL="${USER_USERNAME}@${CURRENT_DOMAIN}"
-
-			# Check user limit
-			CURRENT_USER_COUNT=$(get_container_user_count "$SMTP_CONTAINER")
-			if [ "$CURRENT_USER_COUNT" -ge "$MAX_USERS" ]; then
-				echo -e "${RED}✗ Cannot add ${USER_USERNAME}: maximum user limit ($MAX_USERS) reached. Skipping.${NC}"
-				USER_USERNAME=""
-				continue
-			fi
-
-			# Check if user already exists in database
-			USER_EXISTS=$(docker exec "$SMTP_CONTAINER" bash -c "sqlite3 /app/data/databases/shared.db \"SELECT COUNT(*) FROM users u INNER JOIN domains d ON u.domain_id = d.id WHERE u.username='${USER_USERNAME}' AND d.domain='${CURRENT_DOMAIN}' AND u.enabled=1;\"" 2>/dev/null || echo "0")
-			if [ "$USER_EXISTS" != "0" ]; then
-				echo -e "${YELLOW}⚠ User ${USER_EMAIL} already exists. Skipping.${NC}"
-				USER_USERNAME=""
-				continue
-			fi
-
-			echo -e "\n${YELLOW}Creating user $USER_EMAIL in Thunder (Admin-Initiated Onboarding)...${NC}"
-
-			# Step 1: Start USER_ONBOARDING flow
-			echo -e "${CYAN}  → Step 1: Starting USER_ONBOARDING flow...${NC}"
-			if ! thunder_api_call "https://${THUNDER_HOST}:${THUNDER_PORT}/flow/execute" \
-				'{"flowType":"USER_ONBOARDING","verbose":true}' \
-				"start USER_ONBOARDING flow"; then
-				USER_USERNAME=""
-				continue
-			fi
-
-			FLOW_ID=$(echo "$API_RESPONSE_BODY" | grep -o '"flowId":"[^"]*' | sed 's/"flowId":"//')
-			if [ -z "$FLOW_ID" ]; then
-				echo -e "${RED}✗ Failed to extract flowId${NC}"
-				USER_USERNAME=""
-				continue
-			fi
-
-			echo -e "${GREEN}  ✓ Flow started: $FLOW_ID${NC}"
-
-			# Step 2: Submit user type (emailuser maps to "Person")
-			echo -e "${CYAN}  → Step 2: Submitting user type...${NC}"
-			if ! thunder_api_call "https://${THUNDER_HOST}:${THUNDER_PORT}/flow/execute" \
-				"{\"flowId\":\"${FLOW_ID}\",\"inputs\":{\"userType\":\"Person\"},\"verbose\":true,\"action\":\"usertype_submit\"}" \
-				"submit user type"; then
-				USER_USERNAME=""
-				continue
-			fi
-
-			echo -e "${GREEN}  ✓ User type submitted${NC}"
-
-			# Step 3: Submit email address
-			echo -e "${CYAN}  → Step 3: Submitting email address...${NC}"
-			if ! thunder_api_call "https://${THUNDER_HOST}:${THUNDER_PORT}/flow/execute" \
-				"{\"flowId\":\"${FLOW_ID}\",\"inputs\":{\"email\":\"${USER_EMAIL}\"},\"verbose\":true,\"action\":\"action_submit_email\"}" \
-				"submit email"; then
-				USER_USERNAME=""
-				continue
-			fi
-
-			echo -e "${GREEN}  ✓ Email submitted${NC}"
-
-			# Extract invite link from response
-			INVITE_URL=$(echo "$API_RESPONSE_BODY" | grep -o '"inviteLink":"[^"]*' | sed 's/"inviteLink":"//;s/\\u0026/\&/g;s/\\//g')
-
-			if [ -z "$INVITE_URL" ]; then
-				echo -e "${RED}✗ Failed to extract invite link from response${NC}"
-				echo -e "${YELLOW}Response: $API_RESPONSE_BODY${NC}"
-				USER_USERNAME=""
-				continue
-			fi
-
-			echo -e "${GREEN}✓ User $USER_EMAIL created successfully in Thunder${NC}"
-			echo -e "${GREEN}  Invite link generated${NC}"
-
-			# Update virtual configuration (SQLite database)
-			if update_container_virtual_users "$SMTP_CONTAINER" "$USER_EMAIL" "$USER_USERNAME" "$CURRENT_DOMAIN"; then
-				echo -e "${GREEN}✓ User $USER_EMAIL added to SQLite database${NC}"
-
-				# Store invite URL
-				echo "EMAIL: $USER_EMAIL" >>"$INVITE_URLS_FILE"
-				echo "INVITE URL: $INVITE_URL" >>"$INVITE_URLS_FILE"
-				echo "" >>"$INVITE_URLS_FILE"
-
-				# Display info
-				echo -e "${BLUE}📧 Email: ${GREEN}$USER_EMAIL${NC}"
-				echo -e "${BLUE}🔗 Invite URL: ${YELLOW}$INVITE_URL${NC}"
-				echo -e "${CYAN}   User must visit this URL to set their password${NC}"
-
-				ADDED_COUNT=$((ADDED_COUNT + 1))
-			else
-				echo -e "${RED}✗ Failed to add $USER_EMAIL to virtual configuration${NC}"
-			fi
-
-			USER_USERNAME=""
-		fi
-	fi
-done <"$USERS_FILE"
-
-# -------------------------------
-# Step 5: Process role mailboxes and assignments
-# -------------------------------
-echo -e "\n${CYAN}========================================${NC}"
-echo -e "${CYAN}Processing Role Mailboxes${NC}"
-echo -e "${CYAN}========================================${NC}"
-
-# Create role mailboxes
-for domain in "${!DOMAIN_ROLES[@]}"; do
-	IFS=',' read -ra ROLES <<<"${DOMAIN_ROLES[$domain]}"
-	for role in "${ROLES[@]}"; do
-		if [ -n "$role" ]; then
-			if create_role_mailbox "$SMTP_CONTAINER" "$role" "$domain"; then
-				ROLES_CREATED_COUNT=$((ROLES_CREATED_COUNT + 1))
-			fi
-		fi
-	done
-done
-
-echo -e "\n${CYAN}========================================${NC}"
-echo -e "${CYAN}Assigning Users to Roles${NC}"
-echo -e "${CYAN}========================================${NC}"
-
-# Assign users to roles
-for role_key in "${!ROLE_ASSIGNMENTS[@]}"; do
-	IFS=':' read -r domain role <<<"$role_key"
-	IFS=',' read -ra USERS <<<"${ROLE_ASSIGNMENTS[$role_key]}"
-
-	echo -e "\n${YELLOW}Processing role ${role}@${domain}${NC}"
-
-	for user in "${USERS[@]}"; do
-		if [ -n "$user" ]; then
-			if assign_user_to_role "$SMTP_CONTAINER" "$user" "$role" "$domain"; then
-				ASSIGNMENTS_COUNT=$((ASSIGNMENTS_COUNT + 1))
-			fi
-		fi
-	done
-done
-
-# -------------------------------
-# Step 6: Final Postfix configuration reload
-# -------------------------------
-if [ "$ADDED_COUNT" -gt 0 ]; then
-	echo -e "\n${YELLOW}Applying final Postfix configuration changes...${NC}"
-
-	# Hot reload postfix configuration (SQLite queries are dynamic, no rebuild needed)
-	echo -e "${YELLOW}Reloading Postfix configuration...${NC}"
-	if docker exec "$SMTP_CONTAINER" postfix reload; then
-		echo -e "${GREEN}✓ Postfix configuration reloaded successfully${NC}"
-	else
-		echo -e "${RED}✗ Failed to reload Postfix configuration${NC}"
-		exit 1
-	fi
-
-	# Verify the changes from SQLite database
-	echo -e "${YELLOW}Verifying SQLite database contents...${NC}"
-	echo "Active domains:"
-	docker exec "$SMTP_CONTAINER" sqlite3 /app/data/databases/shared.db "SELECT domain FROM domains WHERE enabled=1;"
-	echo "Active users (last 5):"
-	docker exec "$SMTP_CONTAINER" sqlite3 /app/data/databases/shared.db "SELECT u.username || '@' || d.domain as email FROM users u INNER JOIN domains d ON u.domain_id = d.id WHERE u.enabled=1 ORDER BY u.id DESC LIMIT 5;"
-
-	echo -e "${GREEN}✓ All configuration changes applied successfully${NC}"
-else
-	echo -e "${YELLOW}No new users added, skipping configuration reload.${NC}"
-fi
-
-# -------------------------------
-# Final Summary
-# -------------------------------
-TOTAL_USERS=$(get_container_user_count "$SMTP_CONTAINER")
-DOMAIN_COUNT=$(docker exec "$SMTP_CONTAINER" sqlite3 /app/data/databases/shared.db "SELECT COUNT(*) FROM domains WHERE enabled=1;" 2>/dev/null | tr -d '\n\r')
-TOTAL_ROLES=$(docker exec "$SMTP_CONTAINER" sqlite3 /app/data/databases/shared.db "SELECT COUNT(*) FROM role_mailboxes WHERE enabled=1;" 2>/dev/null | tr -d '\n\r')
-TOTAL_ASSIGNMENTS=$(docker exec "$SMTP_CONTAINER" sqlite3 /app/data/databases/shared.db "SELECT COUNT(*) FROM user_role_assignments WHERE is_active=1;" 2>/dev/null | tr -d '\n\r')
-
-echo -e "\n${CYAN}==============================================${NC}"
-echo -e " 🎉 ${GREEN}User Setup Complete!${NC}"
-echo " Total new users added: $ADDED_COUNT"
-echo " Total domains configured: $DOMAIN_COUNT"
-echo " Total users now: $TOTAL_USERS"
-echo ""
-echo -e " ${GREEN}Role-Based Mail System:${NC}"
-echo " Total role mailboxes created: $ROLES_CREATED_COUNT"
-echo " Total role mailboxes now: $TOTAL_ROLES"
-echo " Total user-role assignments: $ASSIGNMENTS_COUNT"
-echo " Total assignments now: $TOTAL_ASSIGNMENTS"
-echo ""
-echo -e "${CYAN}Active Domains:${NC}"
-docker exec "$SMTP_CONTAINER" sqlite3 /app/data/databases/shared.db "SELECT '  • ' || domain FROM domains WHERE enabled=1;"
-echo ""
-echo -e "${CYAN}Active Role Mailboxes:${NC}"
-docker exec "$SMTP_CONTAINER" sqlite3 /app/data/databases/shared.db "SELECT '  • ' || r.email || ' (ID: ' || r.id || ')' FROM role_mailboxes r WHERE r.enabled=1;" 2>/dev/null || echo "  (none)"
-echo ""
-echo -e "${CYAN}User-Role Assignments:${NC}"
-docker exec "$SMTP_CONTAINER" sqlite3 /app/data/databases/shared.db "SELECT '  • ' || u.username || '@' || d.domain || ' → ' || r.email FROM user_role_assignments ura INNER JOIN users u ON ura.user_id = u.id INNER JOIN role_mailboxes r ON ura.role_mailbox_id = r.id INNER JOIN domains d ON u.domain_id = d.id WHERE ura.is_active=1;" 2>/dev/null || echo "  (none)"
-echo ""
-echo -e "${BLUE}🔐 User Registration:${NC}"
-echo -e " Invite URLs saved to: ${YELLOW}$INVITE_URLS_FILE${NC}"
-echo -e " Users must visit their invite URLs to complete registration and set passwords"
-echo ""
-echo -e "${CYAN}Next Steps:${NC}"
-echo -e " 1. Share the invite URLs with the respective users"
-echo -e " 2. Users will complete registration by setting their passwords"
-echo -e " 3. After registration, users can access their mailboxes"
-echo ""
-echo -e "${GREEN}✅ All users are active immediately - no container rebuild required!${NC}"
-echo -e "${CYAN}==============================================${NC}"