diff --git a/onionshare/__init__.py b/onionshare/__init__.py
index 5df59975..765a083e 100644
--- a/onionshare/__init__.py
+++ b/onionshare/__init__.py
@@ -127,6 +127,13 @@ def main(cwd=None):
         app = OnionShare(common, onion, local_only, autostop_timer)
         app.set_stealth(stealth)
         app.choose_port()
+
+        # Build the URL
+        if common.settings.get('public_mode'):
+            url = 'http://{0:s}'.format(app.onion_host)
+        else:
+            url = 'http://onionshare:{0:s}@{1:s}'.format(web.slug, app.onion_host)
+
         # Delay the startup if a startup timer was set
         if autostart_timer > 0:
             # Can't set a schedule that is later than the auto-stop timer
@@ -135,10 +142,6 @@ def main(cwd=None):
                 sys.exit()
 
             app.start_onion_service(False, True)
-            if common.settings.get('public_mode'):
-                url = 'http://{0:s}'.format(app.onion_host)
-            else:
-                url = 'http://{0:s}/{1:s}'.format(app.onion_host, web.slug)
             schedule = datetime.now() + timedelta(seconds=autostart_timer)
             if mode == 'receive':
                 print("Files sent to you appear in this folder: {}".format(common.settings.get('data_dir')))
@@ -215,12 +218,6 @@ def main(cwd=None):
                 common.settings.set('slug', web.slug)
                 common.settings.save()
 
-        # Build the URL
-        if common.settings.get('public_mode'):
-            url = 'http://{0:s}'.format(app.onion_host)
-        else:
-            url = 'http://onionshare:{0:s}@{1:s}'.format(web.slug, app.onion_host)
-
         print('')
         if autostart_timer > 0:
             print("Server started")
diff --git a/onionshare_gui/server_status.py b/onionshare_gui/server_status.py
index 3b3a7794..b23a89a8 100644
--- a/onionshare_gui/server_status.py
+++ b/onionshare_gui/server_status.py
@@ -420,8 +420,6 @@ class ServerStatus(QtWidgets.QWidget):
         """
         if self.common.settings.get('public_mode'):
             url = 'http://{0:s}'.format(self.app.onion_host)
-        elif self.mode == ServerStatus.MODE_WEBSITE:
-            url = 'http://onionshare:{0:s}@{1:s}'.format(self.web.slug, self.app.onion_host)
         else:
-            url = 'http://{0:s}/{1:s}'.format(self.app.onion_host, self.web.slug)
+            url = 'http://onionshare:{0:s}@{1:s}'.format(self.web.slug, self.app.onion_host)
         return url