diff --git a/docker-compose.yml b/docker-compose.yml
index 11b676e..9bdfec5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -202,6 +202,7 @@ services:
             - ENABLE_OCTO
             - ENABLE_RECORDING
             - ENABLE_SCTP
+            - ENABLE_AUTO_LOGIN
             - JICOFO_AUTH_USER
             - JICOFO_AUTH_PASSWORD
             - JICOFO_ENABLE_BRIDGE_HEALTH_CHECKS
diff --git a/jicofo/rootfs/defaults/jicofo.conf b/jicofo/rootfs/defaults/jicofo.conf
index 28acae2..10c3e7f 100644
--- a/jicofo/rootfs/defaults/jicofo.conf
+++ b/jicofo/rootfs/defaults/jicofo.conf
@@ -3,6 +3,7 @@
 {{ $AUTH_TYPE := .Env.AUTH_TYPE | default "internal" }}
 {{ $ENABLE_RECORDING := .Env.ENABLE_RECORDING | default "0" | toBool }}
 {{ $ENABLE_OCTO := .Env.ENABLE_OCTO | default "0" | toBool }}
+{{ $ENABLE_AUTO_LOGIN := .Env.ENABLE_AUTO_LOGIN | default "1" | toBool }}
 
 jicofo {
     {{ if $ENABLE_AUTH }}
@@ -22,6 +23,7 @@ jicofo {
       {{ else }}
       login-url = "{{ .Env.XMPP_DOMAIN }}"
       {{ end }}
+      enable-auto-login={{ $ENABLE_AUTO_LOGIN }}
     }
     {{ end }}