diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp
index 969f653d..4f97a86b 100755
--- a/src/freedombone-app-xmpp
+++ b/src/freedombone-app-xmpp
@@ -668,11 +668,11 @@ function xmpp_contact_info {
     fi
 
     { 'contact_info = {';
-      "abuse = { \"mailto:${MY_EMAIL_ADDRESS}\", \"xmpp:${USERNAME}@${HOSTNAME}\" };";
-      "admin = { \"mailto:${MY_EMAIL_ADDRESS}\", \"xmpp:${USERNAME}@${HOSTNAME}\" };";
-      "feedback = { \"mailto:${MY_EMAIL_ADDRESS}\", \"xmpp:${USERNAME}@${HOSTNAME}\" };";
-      "security = { \"xmpp:${USERNAME}@${HOSTNAME}\" };";
-      "support = { \"xmpp:${USERNAME}@${HOSTNAME}\" };";
+      "abuse = { \"mailto:${MY_EMAIL_ADDRESS}\", \"xmpp:${MY_USERNAME}@${HOSTNAME}\" };";
+      "admin = { \"mailto:${MY_EMAIL_ADDRESS}\", \"xmpp:${MY_USERNAME}@${HOSTNAME}\" };";
+      "feedback = { \"mailto:${MY_EMAIL_ADDRESS}\", \"xmpp:${MY_USERNAME}@${HOSTNAME}\" };";
+      "security = { \"xmpp:${MY_USERNAME}@${HOSTNAME}\" };";
+      "support = { \"xmpp:${MY_USERNAME}@${HOSTNAME}\" };";
       '};'; } >> "$filename"
 }