diff --git a/bundles/matrix-registration/files/config.yaml b/bundles/matrix-registration/files/config.yaml
index 27d2467..b5e7b96 100644
--- a/bundles/matrix-registration/files/config.yaml
+++ b/bundles/matrix-registration/files/config.yaml
@@ -3,7 +3,7 @@ server_name: '${server_name}'
 registration_shared_secret: '${reg_secret}'
 admin_api_shared_secret: '${admin_secret}'
 base_url: '${base_url}'
-client_redirect: 'https://app.element.io/#/login'
+client_redirect: '${client_redirect}'
 client_logo: 'static/images/element-logo.png' # use '{cwd}' for current working directory
 #db: 'sqlite:///opt/matrix-registration/data/db.sqlite3'
 db: 'postgresql://${database['user']}:${database['password']}@localhost/${database['database']}'
diff --git a/bundles/matrix-registration/items.py b/bundles/matrix-registration/items.py
index a1fe4f8..10b5a92 100644
--- a/bundles/matrix-registration/items.py
+++ b/bundles/matrix-registration/items.py
@@ -37,11 +37,12 @@ git_deploy['/opt/matrix-registration/src'] = {
 files['/opt/matrix-registration/config.yaml'] = {
     'content_type': 'mako',
     'context': {
-        'server_name': node.metadata.get('matrix-synapse/server_name'),
-        'reg_secret': '',
         'admin_secret': node.metadata.get('matrix-registration/admin_secret'),
-        'database': node.metadata.get('matrix-registration/database'),
         'base_url': node.metadata.get('matrix-registration/base_path', ''),
+        'client_redirect': node.metadata.get('matrix-registration/base_path'),
+        'database': node.metadata.get('matrix-registration/database'),
+        'reg_secret': '',
+        'server_name': node.metadata.get('matrix-synapse/server_name'),
     },
     'triggers': {
         'svc_systemd:matrix-registration:restart',