diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index ccfef73b..598d5309 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -97,7 +97,7 @@ function show_sip_extensions {
             echo $(echo "$ext" | awk -F '>' '{print $2}' | awk -F '<' '{print $1}')
         fi
     done < $SIP_CONFIG_FILE
-    any_key 
+    any_key
 }
 
 function select_user {
@@ -147,7 +147,7 @@ function configure_remote_backups {
     if [ ${#ADMIN} -lt 2 ]; then
         dialog --title "Administrator user" \
                --msgbox "Username not found" 6 40
-        return      
+        return
     fi
     if [ ! -d /home/$ADMIN_USER ]; then
         dialog --title "Administrator user" \
@@ -470,19 +470,28 @@ function restore_data_remote {
             restorefromfriend $friend_server_domain_name
             any_key
             ;;
-    esac        
+    esac
 }
 
 function logging_on_off {
+    logging="no"
     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;;
+        0) logging="yes";;
         255) return;;
     esac
+
+    clear
+    echo ''
+    echo 'This may take a few seconds. Please wait...'
+    if [[ $logging == "no" ]]; then
+        freedombone-logging off
+    else
+        freedombone-logging on
+    fi
 }
 
 function restore_gpg_key {
@@ -546,11 +555,11 @@ function hubzilla_channel_directory_server {
             dialog --title "Hubzilla channel directory server" \
                    --msgbox "Domain channel directory server changed to $hubzilla_domain_server" 6 40
             ;;
-    esac       
+    esac
 }
 
 function format_drive {
-    drive=    
+    drive=
     data=$(tempfile 2>/dev/null)
     trap "rm -f $data" 0 1 2 5 15
     dialog --backtitle "Freedombone Control Panel" \