diff --git a/roles/docker-espocrm/templates/env.j2 b/roles/docker-espocrm/templates/env.j2
index 404c89f2..0b88fe5d 100644
--- a/roles/docker-espocrm/templates/env.j2
+++ b/roles/docker-espocrm/templates/env.j2
@@ -54,7 +54,7 @@ ESPOCRM_CONFIG_SMTP_SECURITY={{ "TLS" if system_email.start_tls else "SSL"}}
 ESPOCRM_CONFIG_SMTP_AUTH=true
 ESPOCRM_CONFIG_SMTP_USERNAME={{ users['contact'].email }}
 ESPOCRM_CONFIG_SMTP_PASSWORD={{ users['contact'].mailu_token }}
-ESPOCRM_CONFIG_OUTBOUND_EMAIL_FROM_NAME={{ service_provider.company.titel }} - CRM
+ESPOCRM_CONFIG_OUTBOUND_EMAIL_FROM_NAME={{ applications[application_id].email.from_name}}
 ESPOCRM_CONFIG_OUTBOUND_EMAIL_FROM_ADDRESS={{ users['contact'].email }}
 
 # ------------------------------------------------
@@ -100,6 +100,6 @@ ESPOCRM_CONFIG_OIDC_AUTHORIZATION_REDIRECT_URI=https://{{ domains | get_domain(a
 ESPOCRM_CONFIG_OIDC_CREATE_USER=true
 ESPOCRM_CONFIG_OIDC_SYNC=true
 ESPOCRM_CONFIG_OIDC_USERNAME_CLAIM={{oidc.attributes.username}}
-# ESPOCRM_CONFIG_OIDC_SYNC_TEAMS=true      # (optional) Gruppen-→-Team-Mapping
+# ESPOCRM_CONFIG_OIDC_SYNC_TEAMS=true
 # ESPOCRM_CONFIG_OIDC_GROUP_CLAIM=group
 {% endif %}
diff --git a/roles/docker-espocrm/vars/main.yml b/roles/docker-espocrm/vars/main.yml
index fdf94800..bc2f317e 100644
--- a/roles/docker-espocrm/vars/main.yml
+++ b/roles/docker-espocrm/vars/main.yml
@@ -1,3 +1,5 @@
 application_id: "espocrm"
 # EspoCRM uses MySQL/MariaDB
-database_type: "mariadb"
\ No newline at end of file
+database_type: "mariadb"
+email:
+  from_name: "Customer Relationship Management ({{ primary_domain }})"
\ No newline at end of file