diff --git a/setup/so-setup b/setup/so-setup
index 0fa16e110..39fcae904 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -468,8 +468,10 @@ 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"
+	if [[ $is_master ]]; then
+		set_progress_str 87 'Adding user to SOC'
+		add_web_user 2>> "$setup_log"
+	fi
 
 	set_progress_str 90 'Enabling checkin at boot'
 	checkin_at_boot 2>> "$setup_log"