diff --git a/docs/registering-users.md b/docs/registering-users.md
index b934a55a..9822979d 100644
--- a/docs/registering-users.md
+++ b/docs/registering-users.md
@@ -16,4 +16,14 @@ You can do it via this Ansible playbook (make sure to edit the `<your-username>`
 
 -----
 
-If you've just installed Matrix, **to finalize the installation process**, it's best if you proceed to [Configuring service discovery via .well-known](configuring-well-known.md)
\ No newline at end of file
+If you've just installed Matrix, **to finalize the installation process**, it's best if you proceed to [Configuring service discovery via .well-known](configuring-well-known.md)
+
+-----
+
+The script `/usr/local/bin/matrix-make-user-admin` may be used to upgrade a user's privileges:
+
+* log on to your server with ssh
+* execute with the username:
+
+    /usr/local/bin/matrix-make-user-admin <username>
+
diff --git a/roles/matrix-server/tasks/setup/setup_postgres.yml b/roles/matrix-server/tasks/setup/setup_postgres.yml
index bbaebad7..fdf253be 100644
--- a/roles/matrix-server/tasks/setup/setup_postgres.yml
+++ b/roles/matrix-server/tasks/setup/setup_postgres.yml
@@ -62,6 +62,12 @@
     dest: "/usr/local/bin/matrix-postgres-cli"
     mode: 0750
 
+- name: Ensure matrix-make-user-admin script created
+  template:
+    src: "{{ role_path }}/templates/usr-local-bin/matrix-make-user-admin.j2"
+    dest: "/usr/local/bin/matrix-make-user-admin"
+    mode: 0750
+
 #
 # Tasks related to setting up an internal postgres server
 #
diff --git a/roles/matrix-server/templates/usr-local-bin/matrix-make-user-admin.j2 b/roles/matrix-server/templates/usr-local-bin/matrix-make-user-admin.j2
new file mode 100644
index 00000000..37d72370
--- /dev/null
+++ b/roles/matrix-server/templates/usr-local-bin/matrix-make-user-admin.j2
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+if [ $# -ne 1 ]; then
+        echo "Usage: "$0" <username>"
+        exit 1
+fi
+
+docker run \
+        -it \
+        --rm \
+        --env-file={{ matrix_environment_variables_data_path }}/env-postgres-pgsql-docker \
+        --network {{ matrix_docker_network }} \
+        {{ matrix_postgres_docker_image_to_use }} \
+        psql -h {{ matrix_postgres_connection_hostname }} -c "UPDATE users set admin=1 WHERE name like '@$1:{{ host_specific_hostname_identity }}'"
+