diff --git a/roles/custom/matrix-authentication-service/defaults/main.yml b/roles/custom/matrix-authentication-service/defaults/main.yml
index c86ba0cc9..b330017ab 100644
--- a/roles/custom/matrix-authentication-service/defaults/main.yml
+++ b/roles/custom/matrix-authentication-service/defaults/main.yml
@@ -231,6 +231,24 @@ matrix_authentication_service_config_account_password_change_allowed: true
 # This has no effect if password login is disabled.
 matrix_authentication_service_config_account_password_recovery_enabled: false
 
+# Controls the `account.account_deactivation_allowed` configuration setting.
+#
+# Whether users are allowed to delete their own account
+matrix_authentication_service_config_account_account_deactivation_allowed: true
+
+# Controls the `account.login_with_email_allowed` configuration setting.
+#
+# Whether users can log in with their email address.
+# This has no effect if password login is disabled.
+matrix_authentication_service_config_account_login_with_email_allowed: false
+
+# Controls the `account.registration_token_required` configuration setting.
+#
+# Whether registration tokens are required for password registrations.
+# When enabled, users must provide a valid registration token during password
+# registration. This has no effect if password registration is disabled.
+matrix_authentication_service_config_account_registration_token_required: false
+
 ########################################################################################
 #                                                                                      #
 # /Account configuration                                                               #
diff --git a/roles/custom/matrix-authentication-service/templates/config.yaml.j2 b/roles/custom/matrix-authentication-service/templates/config.yaml.j2
index c0794ed77..38dd62948 100644
--- a/roles/custom/matrix-authentication-service/templates/config.yaml.j2
+++ b/roles/custom/matrix-authentication-service/templates/config.yaml.j2
@@ -67,6 +67,9 @@ account:
   password_registration_enabled: {{ matrix_authentication_service_config_account_password_registration_enabled | to_json }}
   password_change_allowed: {{ matrix_authentication_service_config_account_password_change_allowed | to_json }}
   password_recovery_enabled: {{ matrix_authentication_service_config_account_password_recovery_enabled | to_json }}
+  account_deactivation_allowed: {{ matrix_authentication_service_config_account_account_deactivation_allowed | to_json }}
+  login_with_email_allowed: {{ matrix_authentication_service_config_account_login_with_email_allowed | to_json }}
+  registration_token_required: {{ matrix_authentication_service_config_account_registration_token_required | to_json }}
 
 clients: {{ matrix_authentication_service_config_clients | to_json }}