diff --git a/setup/so-functions b/setup/so-functions
index 462d3b64c..e487e5542 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -247,7 +247,7 @@ check_soremote_pass() {
 }
 
 check_fleet_node_pass() {
-	check_pass_match "$FLEETNODEPASSWD1" "$FLEETNODEPASSWD2" "fpMATCH"
+	check_pass_match "$FLEETNODEPASSWD1" "$FLEETNODEPASSWD2" "FPMATCH"
 }
 
 check_web_pass() {
@@ -302,12 +302,8 @@ collect_fleetuser_inputs() {
 	FPMATCH=no
 	while [[ $FPMATCH != yes ]]; do
 		whiptail_create_fleet_node_user_password1
-		if echo "$FLEETNODEPASSWD1" | so-user valpass >> "$setup_log" 2>&1; then
-			whiptail_create_fleet_node_user_password2
-			check_fleet_node_pass
-		else
-			whiptail_invalid_pass_warning
-		fi
+		whiptail_create_fleet_node_user_password2
+		check_fleet_node_pass
 	done
 }