diff --git a/roles/matrix-base/defaults/main.yml b/roles/matrix-base/defaults/main.yml
index 9fc14e8a..2356c19d 100644
--- a/roles/matrix-base/defaults/main.yml
+++ b/roles/matrix-base/defaults/main.yml
@@ -228,6 +228,7 @@ run_synapse_register_user: true
 run_synapse_update_user_password: true
 run_synapse_import_media_store: true
 run_synapse_rust_synapse_compress_state: true
+run_dendrite_register_user: true
 run_setup: true
 run_self_check: true
 run_start: true
diff --git a/roles/matrix-dendrite/tasks/main.yml b/roles/matrix-dendrite/tasks/main.yml
index e44134a5..815135d7 100644
--- a/roles/matrix-dendrite/tasks/main.yml
+++ b/roles/matrix-dendrite/tasks/main.yml
@@ -15,7 +15,7 @@
     - setup-dendrite
 
 - import_tasks: "{{ role_path }}/tasks/register_user.yml"
-  when: run_dendrite_register_user|bool
+  when: run_dendrite_register_user|bool and matrix_dendrite_enabled|bool
   tags:
     - register-user
 
@@ -33,11 +33,6 @@
   tags:
     - self-check
 
-- import_tasks: "{{ role_path }}/tasks/update_user_password.yml"
-  when: run_dendrite_update_user_password|bool
-  tags:
-    - update-user-password
-
 - name: Mark matrix-dendrite role as executed
   set_fact:
     matrix_dendrite_role_executed: true
diff --git a/roles/matrix-dendrite/tasks/update_user_password.yml b/roles/matrix-dendrite/tasks/update_user_password.yml
deleted file mode 100644
index 5fbd23c2..00000000
--- a/roles/matrix-dendrite/tasks/update_user_password.yml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-- name: Fail if playbook called incorrectly
-  fail:
-    msg: "The `username` variable needs to be provided to this playbook, via --extra-vars"
-  when: "username is not defined or username == '<your-username>'"
-
-- name: Fail if playbook called incorrectly
-  fail:
-    msg: "The `password` variable needs to be provided to this playbook, via --extra-vars"
-  when: "password is not defined or password == '<your-password>'"
-
-- name: Fail if not using matrix-postgres container
-  fail:
-    msg: "This command is working only when matrix-postgres container is being used"
-  when: "not matrix_postgres_enabled|bool"
-
-- name: Ensure matrix-dendrite is started
-  service:
-    name: matrix-dendrite
-    state: started
-    daemon_reload: yes
-  register: start_result
-
-- name: Ensure matrix-postgres is started
-  service:
-    name: matrix-postgres
-    state: started
-    daemon_reload: yes
-  register: postgres_start_result
-
-- name: Wait a while, so that Matrix Dendrite can manage to start
-  pause:
-    seconds: 7
-  when: "start_result.changed or postgres_start_result.changed"
-
-- name: Generate password hash
-  shell: "{{ matrix_host_command_docker }} exec matrix-dendrite /usr/local/bin/hash_password -c /data/homeserver.yaml -p {{ password|quote }}"
-  register: password_hash
-
-- name: Update user password hash
-  command: "{{ matrix_local_bin_path }}/matrix-postgres-update-user-password-hash {{ username|quote }} {{ password_hash.stdout|quote }}"
diff --git a/roles/matrix-synapse/tasks/main.yml b/roles/matrix-synapse/tasks/main.yml
index 8bf1c563..17eef9cc 100644
--- a/roles/matrix-synapse/tasks/main.yml
+++ b/roles/matrix-synapse/tasks/main.yml
@@ -20,7 +20,7 @@
     - import-synapse-media-store
 
 - import_tasks: "{{ role_path }}/tasks/register_user.yml"
-  when: run_synapse_register_user|bool
+  when: run_synapse_register_user|bool and matrix_synapse_enabled|bool
   tags:
     - register-user
 
@@ -39,7 +39,7 @@
     - self-check
 
 - import_tasks: "{{ role_path }}/tasks/update_user_password.yml"
-  when: run_synapse_update_user_password|bool
+  when: run_synapse_update_user_password|bool and matrix_synapse_enabled|bool
   tags:
     - update-user-password