diff --git a/roles/matrix-server/templates/usr-local-bin/matrix-synapse-register-user.j2 b/roles/matrix-server/templates/usr-local-bin/matrix-synapse-register-user.j2
index 50341320e..43e7d8d0d 100644
--- a/roles/matrix-server/templates/usr-local-bin/matrix-synapse-register-user.j2
+++ b/roles/matrix-server/templates/usr-local-bin/matrix-synapse-register-user.j2
@@ -9,10 +9,9 @@ user=$1
 password=$2
 admin=$3
 
-extraFlags=""
-
 if [ "$admin" -eq "1" ]; then
-        extraFlags=$extraFlags" -a"
-fi
-
-docker exec matrix-synapse register_new_matrix_user -u $user -p $password $extraFlags -c /data/homeserver.yaml https://localhost:8448
\ No newline at end of file
+        docker exec matrix-synapse register_new_matrix_user -a -u $user -p $password -c /data/homeserver.yaml https://localhost:8448
+else
+        # If `-a` is not passed, we need to answer to an "admin: yes/no" question
+        echo 'no' | docker exec -i matrix-synapse register_new_matrix_user -u $user -p $password $extraFlags -c /data/homeserver.yaml https://localhost:8448
+fi
\ No newline at end of file