diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index b7153e5e44d1a745b53776fbe30b567c30d7d45b..87aef69fff46f8b72afe2ce8c60cd53420d47f5b 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -104,7 +104,7 @@ function web_admin_create_users {
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
         if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
             userfile="$webadmin_install_dir/userprofile_${USERNAME}.html"
-            useremail=${USERNAME}@${DEFAULT_DOMAIN_NAME}
+            useremail=${USERNAME}@${HOSTNAME}
             GPG_ID=$(su -c "gpg --list-keys '$useremail'" - "$USERNAME" | sed -n '2p' | sed 's/^[ \t]*//')
             if [ -f "/home/$USERNAME/.gnupg/gpg.conf" ]; then
                 if grep -q "default-key" "/home/$USERNAME/.gnupg/gpg.conf"; then