diff --git a/src/freedombone-app-scuttlebot b/src/freedombone-app-scuttlebot
index 19062759..c9438253 100755
--- a/src/freedombone-app-scuttlebot
+++ b/src/freedombone-app-scuttlebot
@@ -44,7 +44,8 @@ scuttlebot_variables=(MY_USERNAME
                       SYSTEM_TYPE)
 
 function scuttlebot_create_invite {
-    invite_string=$(su -c "sbot invite.create 1" - scuttlebot | sed 's/"//g')
+    SCUTTLEBOT_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_scuttlebot/hostname)
+    invite_string=$(su -c "sbot invite.create 1" - scuttlebot | sed 's/"//g' | sed 's/$DEFAULT_DOMAIN_NAME/$SCUTTLEBOT_ONION_HOSTNAME/g')
 
     clear
     echo -e '\n\nYour Scuttlebot invite code is:\n\n'${invite_string}'\n\n'
@@ -233,7 +234,7 @@ function install_scuttlebot {
     fi
 
     echo '{' > /etc/scuttlebot/.ssb/config
-    echo "  \"host\": \"${SCUTTLEBOT_ONION_HOSTNAME}\"," >> /etc/scuttlebot/.ssb/config
+    echo "  \"host\": \"${DEFAULT_DOMAIN_NAME}\"," >> /etc/scuttlebot/.ssb/config
     echo "  \"port\": ${SCUTTLEBOT_PORT}," >> /etc/scuttlebot/.ssb/config
     echo '  "timeout": 30000,' >> /etc/scuttlebot/.ssb/config
     echo '  "pub": true,' >> /etc/scuttlebot/.ssb/config