diff --git a/setup/so-setup b/setup/so-setup
index 696fbe872..418851f33 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -255,7 +255,6 @@ if [[ $is_master ]]; then
 	generate_passwords 2>> "$setup_log"
 	secrets_pillar 2>> "$setup_log"
 	add_socore_user_master 2>> "$setup_log"
-	add_web_user 2>> "$setup_log"
 fi
 
 if [[ $is_master && ! $is_eval ]]; then
@@ -460,6 +459,9 @@ export percentage=0
 	set_progress_str 86 'Updating packages'
 	update_packages 2>> "$setup_log"
 
+	set_progress_str 87 'Adding user to SOC'
+	add_web_user 2>> "$setup_log"
+
 	set_progress_str 90 'Enabling checkin at boot'
 	checkin_at_boot 2>> "$setup_log"