diff --git a/roles/web-app-keycloak/templates/import/smtp_server.json.j2 b/roles/web-app-keycloak/templates/import/smtp_server.json.j2
index 15a951b2..d526de78 100644
--- a/roles/web-app-keycloak/templates/import/smtp_server.json.j2
+++ b/roles/web-app-keycloak/templates/import/smtp_server.json.j2
@@ -7,7 +7,7 @@
     "replyTo": "",
     "host": "{{ SYSTEM_EMAIL.HOST }}",
     "from": "{{ users['no-reply'].email }}",
-    "fromDisplayName": "Keycloak Authentication System - {{ KEYCLOAK_DOMAIN | upper }}",
+    "fromDisplayName": "Authentication System ({{ PRIMARY_DOMAIN | lower }})",
     "envelopeFrom": "",
     "ssl": "{{ (SYSTEM_EMAIL.TLS and not SYSTEM_EMAIL.START_TLS) | ternary('true','false') }}",
     "user": "{{ users['no-reply'].email }}"
diff --git a/roles/web-app-keycloak/vars/main.yml b/roles/web-app-keycloak/vars/main.yml
index 5875e4da..46f559a7 100644
--- a/roles/web-app-keycloak/vars/main.yml
+++ b/roles/web-app-keycloak/vars/main.yml
@@ -12,7 +12,6 @@ KEYCLOAK_DEBUG_ENABLED:             "{{ MODE_DEBUG }}"
 KEYCLOAK_CLIENT_ID:                 "{{ OIDC.CLIENT.ID }}"
 KEYCLOAK_SERVER_INTERNAL_URL:       "http://127.0.0.1:8080"
 KEYCLOAK_LOAD_DEPENDENCIES:         "{{ applications | get_app_conf(application_id, 'load_dependencies') }}"
-KEYCLOAK_DOMAIN:                    "{{ domains | get_domain('web-app-keycloak') }}"
 
 # RBAC
 KEYCLOAK_RBAC_GROUP_CLAIM:          "{{ RBAC.GROUP.CLAIM }}"