diff --git a/src/freedombone-config b/src/freedombone-config
index bc53e2c5..345ae092 100755
--- a/src/freedombone-config
+++ b/src/freedombone-config
@@ -550,6 +550,17 @@ function interactive_configuration {
           1) exit 1;;
           255) exit 1;;
       esac
+
+      data=$(tempfile 2>/dev/null)
+      trap "rm -f $data" 0 1 2 5 15
+      dialog --backtitle "Freedombone Configuration" \
+          --inputbox "Give your mesh peer a name" 10 40 "$(grep 'DEFAULT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data
+      sel=$?
+      case $sel in
+          0) ESSID=$(cat $data);;
+          1) exit 1;;
+          255) exit 1;;
+      esac
   fi
 
   if [[ $ENABLE_BATMAN == "yes" ]]; then
@@ -938,17 +949,17 @@ function interactive_configuration {
       while [ ! $MY_NAME ]
       do
           data=$(tempfile 2>/dev/null)
-		  trap "rm -f $data" 0 1 2 5 15
-		  dialog --backtitle "Freedombone Configuration" \
-				 --inputbox "Your full name (or nick)" 10 30 "$(grep 'MY_NAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data
-		  sel=$?
-		  case $sel in
-			  0) MY_NAME=$(cat $data);;
-			  1) exit 1;;
-			  255) exit 1;;
-		  esac
-	  done
-	  save_configuration_file
+          trap "rm -f $data" 0 1 2 5 15
+          dialog --backtitle "Freedombone Configuration" \
+                 --inputbox "Your full name (or nick)" 10 30 "$(grep 'MY_NAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data
+          sel=$?
+          case $sel in
+              0) MY_NAME=$(cat $data);;
+              1) exit 1;;
+              255) exit 1;;
+          esac
+      done
+      save_configuration_file
   fi
 
   if [ ! $LOCAL_NETWORK_STATIC_IP_ADDRESS ]; then