diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index c79861d3..624cb30c 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -2298,7 +2298,7 @@ function menu_top_level {
            21 $"Restart the system")
 
         # shellcheck disable=SC2068
-        selection=$(dialog --backtitle $"Freedombone Control Panel" --title $"Control Panel" --menu $"Choose an operation, or ESC to exit:" 28 60 28 "${W[@]}" 3>&2 2>&1 1>&3)
+        selection=$(dialog --backtitle $"Freedombone Control Panel" --title $"Administrator Control Panel" --menu $"Choose an operation, or ESC to exit:" 28 60 28 "${W[@]}" 3>&2 2>&1 1>&3)
         if [ ! "$selection" ]; then
             break
         fi
diff --git a/src/freedombone-controlpanel-user b/src/freedombone-controlpanel-user
index 7c280d26..69ef228e 100755
--- a/src/freedombone-controlpanel-user
+++ b/src/freedombone-controlpanel-user
@@ -899,28 +899,24 @@ function show_your_email_address {
 function menu_top_level {
     while true
     do
-        data=$(mktemp 2>/dev/null)
-        dialog --backtitle $"Freedombone User Control Panel" \
-               --title $"User Control Panel" \
-               --radiolist $"Choose an operation:" 20 60 13 \
-               1 $"Use Email" off \
-               2 $"Show your Email Address" off \
-               3 $"Change Email Filtering/Blocking Rules" off \
-               4 $"Run an App" off \
-               5 $"Browse the Web" off \
-               6 $"My Encryption Keys" off \
-               7 $"Set an outgoing email proxy" off \
-               8 $"Administrator controls" off \
-               9 $"Exit to the command line" off \
-               10 $"Log out" on 2> "$data"
-        sel=$?
-        case $sel in
-            1) rm -f "$data"
-               exit 1;;
-            255) rm -f "$data"
-                 exit 1;;
-        esac
-        case $(cat "$data") in
+        W=(1 $"Use Email"
+           2 $"Show your Email Address"
+           3 $"Change Email Filtering/Blocking Rules"
+           4 $"Run an App"
+           5 $"Browse the Web"
+           6 $"My Encryption Keys"
+           7 $"Set an outgoing email proxy"
+           8 $"Administrator controls"
+           9 $"Exit to the command line")
+
+        # shellcheck disable=SC2068
+        selection=$(dialog --backtitle $"Freedombone Control Panel" --title $"User Control Panel" --menu $"Choose an operation, or ESC to log out:" 20 60 13 "${W[@]}" 3>&2 2>&1 1>&3)
+        if [ ! "$selection" ]; then
+            kill -HUP "$(pgrep -s 0 -o)"
+            break
+        fi
+
+        case $selection in
             1) mutt;;
             2) show_your_email_address;;
             3) menu_email;;
@@ -929,11 +925,8 @@ function menu_top_level {
             6) menu_encryption_keys;;
             7) smtp_proxy;;
             8) menu_admin;;
-            9) rm -f "$data"
-               break;;
-            10) kill -HUP "$(pgrep -s 0 -o)";;
+            9) break;;
         esac
-        rm -f "$data"
     done
 }