diff --git a/src/freedombone-mesh-batman b/src/freedombone-mesh-batman
index 5b28fc67..8152dd45 100755
--- a/src/freedombone-mesh-batman
+++ b/src/freedombone-mesh-batman
@@ -424,15 +424,7 @@ function start {
         HIDDEN_SERVICE_PATH=/var/lib/tor/hidden_service_
         if [ ! -f ${HIDDEN_SERVICE_PATH}mesh/hostname ]; then
             echo "HiddenServiceDir ${HIDDEN_SERVICE_PATH}mesh/" >> /etc/tor/torrc
-            echo "HiddenServicePort 8008 127.0.0.1:8008" >> /etc/tor/torrc
-            echo "HiddenServicePort 8010 127.0.0.1:8010" >> /etc/tor/torrc
-            echo "HiddenServicePort ${TOX_PORT} 127.0.0.1:${TOX_PORT}" >> /etc/tor/torrc
-            echo "HiddenServicePort ${IPFS_PORT} 127.0.0.1:${IPFS_PORT}" >> /etc/tor/torrc
-            echo "HiddenServicePort ${ZERONET_PORT} 127.0.0.1:${ZERONET_PORT}" >> /etc/tor/torrc
-            echo "HiddenServicePort 5353 127.0.0.1:5353" >> /etc/tor/torrc
-            echo "HiddenServicePort 5354 127.0.0.1:5354" >> /etc/tor/torrc
-            echo "HiddenServicePort 548 127.0.0.1:548" >> /etc/tor/torrc
-            echo "HiddenServiceAuthorizeClient stealth mesh" >> /etc/tor/torrc
+            echo "HiddenServicePort 653 127.0.0.1:653" >> /etc/tor/torrc
             systemctl restart tor
         fi
     else
diff --git a/src/freedombone-mesh-connect b/src/freedombone-mesh-connect
index 39e39c73..5a9163b3 100755
--- a/src/freedombone-mesh-connect
+++ b/src/freedombone-mesh-connect
@@ -158,9 +158,15 @@ function mesh_setup_vpn {
 }
 
 function connect_to_mesh {
+    connect_title=$"Connect to another mesh network"
+    HIDDEN_SERVICE_PATH=/var/lib/tor/hidden_service_mesh/hostname
+    if [ -f ${HIDDEN_SERVICE_PATH} ]; then
+        connect_title=$"Connect from $(cat $HIDDEN_SERVICE_PATH) to another mesh network"
+    fi
+
     data=$(tempfile 2>/dev/null)
     trap "rm -f $data" 0 1 2 5 15
-    dialog --title $"Connect to another mesh network" \
+    dialog --title "$connect_title" \
            --backtitle $"Freedombone Mesh" \
            --inputbox $'Enter the IP address or domain name of the other mesh.' 10 60 2>$data
     sel=$?