diff --git a/setup/so-functions b/setup/so-functions
index 6fbcbeeb4..15fdfd3bd 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -81,7 +81,7 @@ add_soremote_user_master() {
 	$ADDUSER --uid 947 --gid 947 soremote
 	
 	# Set the password for soremote that we got during setup
-	echo soremote:$REMOTEPASS1 | chpasswd --crypt-method=SHA512
+	echo soremote:$SOREMOTEPASS1 | chpasswd --crypt-method=SHA512
 
 }
 
diff --git a/setup/so-whiptail b/setup/so-whiptail
index 00862292c..29ff43be5 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -140,7 +140,7 @@ whiptail_create_soremote_user() {
 
 whiptail_create_soremote_user_password1() {
 
-  REMOTEPASS1=$(whiptail --title "Security Onion Install" --passwordbox \
+  SOREMOTEPASS1=$(whiptail --title "Security Onion Install" --passwordbox \
   "Enter a password for user soremote" 10 75 3>&1 1>&2 2>&3)
 
   local exitstatus=$?
@@ -150,7 +150,7 @@ whiptail_create_soremote_user_password1() {
 
 whiptail_create_soremote_user_password2() {
 
-  REMOTEPASS2=$(whiptail --title "Security Onion Install" --passwordbox \
+  SOREMOTEPASS2=$(whiptail --title "Security Onion Install" --passwordbox \
   "Re-enter a password for user soremote" 10 75 3>&1 1>&2 2>&3)
 
   local exitstatus=$?