diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/labels.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/labels.properties
index 06adbe2ee622..21b519cb8880 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/labels.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/labels.properties
@@ -22,7 +22,8 @@ currency_format={0,number,#,##0.00} {1}
currency_items_format={0,number,#,##0.00} {1} ({2})
contact_label=Email-
Contact
-contact_subject=Phoenix CTMS
+contact_subject=${application.abbreviation} support request
+contact_body=Please describe your issue:\n\n\n--\n${application.abbreviation} ${application.version} ${application.uuid}
error_title=HTTP Error
error_prompt=An unexpected error has occurred:
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/labels_de.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/labels_de.properties
index acb4fbed2daa..faa8c32cdc07 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/labels_de.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/labels_de.properties
@@ -24,7 +24,8 @@ currency_items_format={0,number,#,##0.00} {1} ({2})
contact_label=Email-
Kontakt
-contact_subject=Phoenix CTMS
+contact_subject=${application.abbreviation} Support Anfrage
+contact_body=Bitte beschreiben sie das Problem:\n\n\n--\n${application.abbreviation} ${application.version} ${application.uuid}
error_title=HTTP Fehler
error_prompt=Ein unerwarteter Fehler is aufgetreten:
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/settings.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/settings.properties
index da6ed161ad3a..6f0cf2de08e3 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/settings.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/settings.properties
@@ -13,7 +13,8 @@ menu_item_label_clip_max_length=26
na_status_color=TOMATO
meta_description=${application.name} - {0}
-contact_email=helpdesk@{0}
+contact_email=support@phoenixctms.org
+#contact_email=helpdesk@{0}
banner_image_url=https://www.phoenixctms.org/analytics.php
analytics_uuid=${application.uuid}
diff --git a/web/src/main/webapp/META-INF/templates/baseTemplate.xhtml b/web/src/main/webapp/META-INF/templates/baseTemplate.xhtml
index a47638bf378d..279f807f183b 100644
--- a/web/src/main/webapp/META-INF/templates/baseTemplate.xhtml
+++ b/web/src/main/webapp/META-INF/templates/baseTemplate.xhtml
@@ -394,6 +394,7 @@
+