diff --git a/roles/matrix-mxisd/tasks/main.yml b/roles/matrix-mxisd/tasks/main.yml
index c06265b..d58dc22 100644
--- a/roles/matrix-mxisd/tasks/main.yml
+++ b/roles/matrix-mxisd/tasks/main.yml
@@ -10,4 +10,3 @@
     mode: 0600
     owner: mxisd
   notify: Restart mxisd service
-
diff --git a/roles/matrix-mxisd/templates/mxisd/mxisd.yaml.j2 b/roles/matrix-mxisd/templates/mxisd/mxisd.yaml.j2
index aabb9e6..dfb30a2 100644
--- a/roles/matrix-mxisd/templates/mxisd/mxisd.yaml.j2
+++ b/roles/matrix-mxisd/templates/mxisd/mxisd.yaml.j2
@@ -38,6 +38,11 @@ ldap:
     bindPassword: '{{ ldap_matrix_password }}'
     baseDNs:
       - '{{ ldap_user_tree }}'
+  attribute:
+    uid:
+      type: 'uid'
+      value: 'uid'
+    name: 'uid'
 
 
 #################################################
diff --git a/roles/matrix-synapse/tasks/main.yml b/roles/matrix-synapse/tasks/main.yml
index e3d66a5..642b723 100644
--- a/roles/matrix-synapse/tasks/main.yml
+++ b/roles/matrix-synapse/tasks/main.yml
@@ -13,9 +13,17 @@
     owner: matrix-synapse
   loop:
     - database.yaml
+    - enable_group_creation.yaml
     - listeners.yaml
     - no_tls.yaml
+    - password_providers.yaml
     - server_name.yaml
     - trusted_third_party_id_servers.yaml
   notify: Restart matrix-synapse service
 
+- name: Install rest auth provider
+  get_url:
+    url: https://raw.githubusercontent.com/kamax-matrix/matrix-synapse-rest-auth/master/rest_auth_provider.py
+    dest: /usr/local/lib/python3.5/dist-packages/rest_auth_provider.py
+    mode: 0755
+  notify: Restart matrix-synapse service
diff --git a/roles/matrix-synapse/templates/matrix-synapse/conf.d/enable_group_creation.yaml.j2 b/roles/matrix-synapse/templates/matrix-synapse/conf.d/enable_group_creation.yaml.j2
new file mode 100644
index 0000000..3263872
--- /dev/null
+++ b/roles/matrix-synapse/templates/matrix-synapse/conf.d/enable_group_creation.yaml.j2
@@ -0,0 +1,2 @@
+# {{ ansible_managed }}
+enable_group_creation: true
diff --git a/roles/matrix-synapse/templates/matrix-synapse/conf.d/password_providers.yaml.j2 b/roles/matrix-synapse/templates/matrix-synapse/conf.d/password_providers.yaml.j2
new file mode 100644
index 0000000..8281be3
--- /dev/null
+++ b/roles/matrix-synapse/templates/matrix-synapse/conf.d/password_providers.yaml.j2
@@ -0,0 +1,5 @@
+# {{ ansible_managed }}
+password_providers:
+  - module: "rest_auth_provider.RestAuthProvider"
+    config:
+      endpoint: "http://127.0.0.1:8090"