diff --git a/setup/so-functions b/setup/so-functions
index aec5fe38a..b910e4ee9 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -351,6 +351,10 @@ collect_fleetuser_inputs() {
 	FPMATCH=no
 	while [[ $FPMATCH != yes ]]; do
 		whiptail_create_fleet_node_user_password1
+		while ! check_password "$FLEETNODEPASSWD1"; do
+			whiptail_invalid_pass_characters_warning
+			whiptail_create_fleet_node_user_password1
+		done
 		whiptail_create_fleet_node_user_password2
 		check_fleet_node_pass
 	done