diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index 8d10f6c6..1f7ee3dd 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -1727,15 +1727,16 @@ function menu_top_level {
     done
 }
 
+if [[ $USER != 'root' ]]; then
+    # show the user version of the control panel
+    exit $(freedombone-controlpanel-user)
+fi
+
 if [ ! -f $COMPLETION_FILE ]; then
     echo $'This command should only be run on an installed Freedombone system'
     exit 1
 fi
 
-if [[ $USER != 'root' ]]; then
-    # show the user version of the control panel
-    exit $(freedombone-controlpanel-user)
-fi
 ADMIN_USER=$(cat $COMPLETION_FILE | grep "Admin user" | awk -F ':' '{print $2}')
 read_repo_servers
 menu_top_level