diff --git a/hosts/fw/modules/web/matrix.nix b/hosts/fw/modules/web/matrix.nix
index ecd94be..39507dc 100644
--- a/hosts/fw/modules/web/matrix.nix
+++ b/hosts/fw/modules/web/matrix.nix
@@ -149,15 +149,17 @@ in {
             client_secret: "$CLIENT_SECRET"
             token_endpoint_auth_method: client_secret_post
             scope: "openid email profile"
+            fetch_userinfo: true
             claims_imports:
+              skip_confirmation: true
               localpart:
-                action: force
-                template: "{{ user.email | split('@') | first }}"
+                action: require
+                template: "{{ user.email | replace('@cloonar.com', ''') | replace('@', '_') }}"
               displayname:
-                action: suggest
+                action: force
                 template: "{{ user.name }}"
               email:
-                action: force
+                action: require
                 template: "{{ user.email }}"
                 set_email_verification: always