diff --git a/src/freedombone-config b/src/freedombone-config
index 14404f80..54050397 100755
--- a/src/freedombone-config
+++ b/src/freedombone-config
@@ -1302,9 +1302,11 @@ function select_user {
     name=()
     for u in ${users_array[@]}
     do
-        i=$((i+1))
-        W+=($i "$u")
-        name+=("$u")
+        if [[ $(is_valid_user "$u") == "1" ]]; then
+            i=$((i+1))
+            W+=($i "$u")
+            name+=("$u")
+        fi
     done
 
     user_index=$(dialog --backtitle $"Freedombone Configuration" --title $"Select User" --menu $"Select one of the following:" 24 40 17 "${W[@]}" 3>&2 2>&1 1>&3)
diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index bdc0e3e0..03d13d01 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -396,9 +396,11 @@ function select_user {
     name=()
     for u in ${users_array[@]}
     do
-        i=$((i+1))
-        W+=($i "$u")
-        name+=("$u")
+        if [[ $(is_valid_user "$u") == "1" ]]; then
+            i=$((i+1))
+            W+=($i "$u")
+            name+=("$u")
+        fi
     done
 
     user_index=$(dialog --backtitle $"Freedombone Control Panel" --title $"Select User" --menu $"Select one of the following:" 24 40 17 "${W[@]}" 3>&2 2>&1 1>&3)