diff --git a/src/freedombone-app-scuttlebot b/src/freedombone-app-scuttlebot
index 1b64b6a452433426699645c0e5c74b1c0f6f1ccb..05fddea2a6c6f5cabbbbe1c6f6c91692dee9a6cd 100755
--- a/src/freedombone-app-scuttlebot
+++ b/src/freedombone-app-scuttlebot
@@ -32,6 +32,7 @@ VARIANTS='full full-vim social'
 IN_DEFAULT_INSTALL=0
 SHOW_ON_ABOUT=0
 SHOW_CLEARNET_ADDRESS_ON_ABOUT=0
+SHOW_DOMAIN_IN_WEBADMIN=0
 
 SCUTTLEBOT_VERSION='13.0.0'
 SCUTTLEBOT_REPLICATE_NODES=10
diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index d851765a7f2138e2a035feb8b6dcec4961043040..31505cd6497c760844c7b081b51be2c4e3084307 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -729,16 +729,20 @@ function web_admin_create_installed_apps {
                     fi
 
                     # Replace app variables
-                    if grep -q 'SHOW_DOMAIN_IN_WEBADMIN=0' "$app_filename"; then
-                        sed -i '/app_qrcode_/d' "$filename"
-                        sed -i '/ONIONURL/d' "$filename"
-                        sed -i '/APPURL/d' "$filename"
-                    fi
                     if [ ! "$MOBILE_APP_URL" ]; then
                         sed -i '/MOBILEAPPURL/d' "$filename"
                     else
                         sed -i "s|MOBILEAPPURL|$MOBILE_APP_URL|g" "$filename"
                     fi
+                    if grep -q 'SHOW_DOMAIN_IN_WEBADMIN=0' "$app_filename"; then
+                        sed -i '/app_qrcode_/d' "$filename"
+                        sed -i '/ONIONURL/d' "$filename"
+                        if [[ "$app_name" != 'scuttlebot' ]]; then
+                            sed -i '/APPURL/d' "$filename"
+                        else
+                            sed -i "s|APPURL|$domain_name|g" "$filename"
+                        fi
+                    fi
                     sed -i "s|HOSTNAME|$(hostname)|g" "$filename"
                     sed -i "s|APPNAME|${app_name}|g" "$filename"
                     if [[ "${onion_domain_name}" == *'.'* ]]; then