diff --git a/static/js/pages/setup.js b/static/js/pages/setup.js
index 036adbe31..cbd539c16 100644
--- a/static/js/pages/setup.js
+++ b/static/js/pages/setup.js
@@ -141,7 +141,14 @@
     $scope.showSuperuserPanel = function() {
       $('#setupModal').modal('hide');
       var prefix = $scope.hasSSL ? 'https' : 'http';
-      var hostname = $scope.hostname || document.location.hostname;
+      var hostname = $scope.hostname;
+      if (!hostname) {
+        hostname = document.location.hostname;
+        if (document.location.port) {
+          hostname = hostname + ':' + document.location.port;
+        }
+      }
+
       window.location = prefix + '://' + hostname + '/superuser';
     };
 
diff --git a/util/config/oauth.py b/util/config/oauth.py
index 4e01f713e..e28ca73f5 100644
--- a/util/config/oauth.py
+++ b/util/config/oauth.py
@@ -265,7 +265,7 @@ class OIDCConfig(OAuthConfig):
     self._http_client = config['HTTPCLIENT']
 
     if self.config.get('OIDC_SERVER'):
-      self._load_via_discovery(config['DEBUGGING'])
+      self._load_via_discovery(config.get('DEBUGGING', False))
 
   def _load_via_discovery(self, is_debugging):
     oidc_server = self.config['OIDC_SERVER']