diff --git a/.env.sample b/.env.sample
index 6e33c00..e437ea0 100644
--- a/.env.sample
+++ b/.env.sample
@@ -16,6 +16,7 @@ COMPOSE_FILE="compose.yml"
 #DISABLE_FEDERATION=1
 
 ENABLE_REGISTRATION=false
+PASSWORD_LOGIN_ENABLED=true
 
 #AUTO_JOIN_ROOM_ENABLED=1
 #AUTO_JOIN_ROOM="#example:example.com"
diff --git a/abra.sh b/abra.sh
index a9fc1e5..f10e447 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,3 +1,3 @@
 export ENTRYPOINT_CONF_VERSION=v1
-export HOMESERVER_YAML_VERSION=v5
+export HOMESERVER_YAML_VERSION=v6
 export LOG_CONFIG_VERSION=v2
diff --git a/compose.yml b/compose.yml
index 150646f..c1f08f3 100644
--- a/compose.yml
+++ b/compose.yml
@@ -21,6 +21,7 @@ services:
       - ENABLE_REGISTRATION
       - FEDERATION_ALLOWLIST
       - LETSENCRYPT_HOST=${DOMAIN}
+      - PASSWORD_LOGIN_ENABLED
       - REDACTION_RETENTION_PERIOD
       - ROOT_LOG_LEVEL
       - SQL_LOG_LEVEL
diff --git a/homeserver.yaml.tmpl b/homeserver.yaml.tmpl
index 4ae65c1..2a2d17b 100644
--- a/homeserver.yaml.tmpl
+++ b/homeserver.yaml.tmpl
@@ -2048,7 +2048,7 @@ sso:
 password_config:
    # Uncomment to disable password login
    #
-   #enabled: false
+   enabled: {{ env "PASSWORD_LOGIN_ENABLED" }}
 
    # Uncomment to disable authentication against the local password
    # database. This is ignored if `enabled` is false, and is only useful