diff --git a/src/freedombone-client b/src/freedombone-client
index 5f21a615..088dbeb1 100755
--- a/src/freedombone-client
+++ b/src/freedombone-client
@@ -475,6 +475,14 @@ case $key in
     -h|--help)
     show_help
     ;;
+    --essid)
+    shift
+    ESSID="$1"
+    ;;
+    --channel)
+    shift
+    WIFI_CHANNEL=${1}
+    ;;
     *)
     # unknown option
     ;;
diff --git a/src/freedombone-config b/src/freedombone-config
index 67f8997c..dd849172 100755
--- a/src/freedombone-config
+++ b/src/freedombone-config
@@ -591,7 +591,7 @@ function interactive_configuration {
   #fi
 
   if [[ $SYSTEM_TYPE == "$VARIANT_MESH_USER" ]]; then
-      freedombone-client
+      freedombone-client --essid $ESSID
       if [ "$?" = "0" ]; then
           clear
           echo ".---.                  .              .                   "