diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index 97be91d0..62274070 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -314,7 +314,15 @@ function restore_data_remote {
 }
 
 function logging_on_off {
-    and_key
+    dialog --title "Logging" \
+           --backtitle "Freedombone Control Panel" \
+           --yesno "\nDo you want to turn logging on?" 7 60
+    sel=$?
+    case $sel in
+        0) freedombone-logging on;;
+        1) freedombone-logging off;;
+        255) return;;
+    esac
 }
 
 function restore_gpg_key {
@@ -335,7 +343,7 @@ function menu_top_level {
         trap "rm -f $data" 0 1 2 5 15
         dialog --backtitle "Freedombone Control Panel" \
                --title "Control Panel" \
-               --radiolist "Choose an operation:" 24 70 15 \
+               --radiolist "Choose an operation:" 24 70 16 \
                1 "Backup data to USB drive" off \
                2 "Restore data from USB drive" off \
                3 "Restore from remote backup" off \