diff --git a/synapse/homeserver.yaml b/synapse/homeserver.yaml
index abd5614..f101b97 100755
--- a/synapse/homeserver.yaml
+++ b/synapse/homeserver.yaml
@@ -1,6 +1,5 @@
 # Configuration file for Synapse.
 #
-# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html
 server_name: "matrix.server-nb.de"
 pid_file: /data/homeserver.pid
 listeners:
@@ -55,9 +54,7 @@ enable_3pid_changes: true
 user_directory.search_all_users: true
 matrix_synapse_allow_public_rooms_over_federation: true
 #allow_guest_access: true
-
 #
-# vim:ft=yaml
 email:
   smtp_host: mail.host-nb.de
   smtp_port: 587
diff --git a/synapse/mautrix-whatsapp/config.yaml b/synapse/mautrix-whatsapp/config.yaml
index 6c49b2f..c17bf34 100644
--- a/synapse/mautrix-whatsapp/config.yaml
+++ b/synapse/mautrix-whatsapp/config.yaml
@@ -102,7 +102,8 @@ whatsapp:
 bridge:
     # Localpart template of MXIDs for WhatsApp users.
     # {{.}} is replaced with the phone number of the WhatsApp user.
-    username_template: whatsapp_{{.}}
+    # whatsapp_{{.}}
+    username_template: {{.FullName}}
     # Displayname template for WhatsApp users.
     # {{.PushName}}     - nickname set by the WhatsApp user
     # {{.BusinessName}} - validated WhatsApp business name
@@ -110,7 +111,7 @@ bridge:
     # The following variables are also available, but will cause problems on multi-user instances:
     # {{.FullName}}  - full name from contact list
     # {{.FirstName}} - first name from contact list
-    displayname_template: "{{or .BusinessName .PushName .JID}} (WA)"
+    displayname_template: "{{.FullName}} (WA)"
     # Should the bridge create a space for each logged-in user and add bridged rooms to it?
     # Users who logged in before turning this on should run `!wa sync space` to create and fill the space for the first time.
     personal_filtering_spaces: false