diff --git a/setup/so-functions b/setup/so-functions
index 4013932f0..337478782 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -261,7 +261,7 @@ clear_master() {
 collect_soremote_inputs() {
 	whiptail_create_soremote_user
 	SCMATCH=no
-	while [ $SCMATCH != yes ]; do
+	while [[ $SCMATCH != yes ]]; do
 		whiptail_create_soremote_user_password1
 		whiptail_create_soremote_user_password2
 		check_soremote_pass
@@ -271,7 +271,7 @@ collect_soremote_inputs() {
 collect_adminuser_inputs() {
 	whiptail_create_admin_user
 	APMATCH=no
-	while [ $APMATCH != yes ]; do
+	while [[ $APMATCH != yes ]]; do
 		whiptail_create_admin_user_password1
 		whiptail_create_admin_user_password2
 		check_admin_pass
@@ -282,11 +282,9 @@ collect_adminuser_inputs() {
 collect_webuser_inputs() {
 	# Get a password for the web admin user
 	local valid_user=no
-	while [ $valid_user != yes ]; do
-		whiptail_create_web_user
-		local val_email
-		val_email=$(so-user valemail "$WEBUSER" >> "$setup_log" 2>&1)
-		if $val_email; then
+	while [[ $valid_user != yes ]]; do
+		whiptail_create_web_user		
+		if so-user valemail "$WEBUSER" >> "$setup_log" 2>&1; then
 			valid_user=yes
 		else
 			whiptail_invalid_user_warning
@@ -294,11 +292,9 @@ collect_webuser_inputs() {
 	done
 
 	WPMATCH=no
-	while [ $WPMATCH != yes ]; do
+	while [[ $WPMATCH != yes ]]; do
 		whiptail_create_web_user_password1
-		local val_pass
-		val_pass=$(echo "$WEBPASSWD1" | so-user valpass >> "$setup_log" 2>&1)
-		if $val_pass; then
+		if echo "$WEBPASSWD1" | so-user valpass >> "$setup_log" 2>&1; then
 			whiptail_create_web_user_password2
 			check_web_pass
 		else