diff --git a/app.js b/app.js
index 93c88eb45..845307f73 100644
--- a/app.js
+++ b/app.js
@@ -53,7 +53,15 @@ function init() {
     RTC.addStreamListener(maybeDoJoin, StreamEventTypes.EVENT_TYPE_LOCAL_CREATED);
     RTC.start();
 
-    var jid = document.getElementById('jid').value || config.hosts.anonymousdomain || config.hosts.domain || window.location.hostname;
+    var configDomain = config.hosts.anonymousdomain || config.hosts.domain;
+
+    // Force authenticated domain if room is appended with '?login=true'
+    if (config.hosts.anonymousdomain &&
+        window.location.search.indexOf("login=true") !== -1) {
+        configDomain = config.hosts.domain;
+    }
+
+    var jid = document.getElementById('jid').value || configDomain || window.location.hostname;
     connect(jid);
 }
 
diff --git a/doc/debian/jitsi-meet/jitsi-meet.example b/doc/debian/jitsi-meet/jitsi-meet.example
index 896912b80..f69499fb6 100644
--- a/doc/debian/jitsi-meet/jitsi-meet.example
+++ b/doc/debian/jitsi-meet/jitsi-meet.example
@@ -17,7 +17,7 @@ server {
         alias /etc/jitsi/meet/jitsi-meet.example.com-config.js;
     }
 
-    location ~ ^/([a-zA-Z0-9]+)$ {
+    location ~ ^/([a-zA-Z0-9=\?]+)$ {
         rewrite ^/(.*)$ / break;
     }
 
diff --git a/doc/example-config-files/jitsi.example.com.example b/doc/example-config-files/jitsi.example.com.example
index 68dc464de..96ae864f9 100755
--- a/doc/example-config-files/jitsi.example.com.example
+++ b/doc/example-config-files/jitsi.example.com.example
@@ -6,7 +6,7 @@ server {
     root /srv/jitsi.example.com;
     index index.html;
 
-    location ~ ^/([a-zA-Z0-9]+)$ {
+    location ~ ^/([a-zA-Z0-9=\?]+)$ {
         rewrite ^/(.*)$ / break;
         }