diff --git a/bin/convertdomain b/bin/convertdomain
index f23e015..6911f26 100755
--- a/bin/convertdomain
+++ b/bin/convertdomain
@@ -99,6 +99,9 @@ convert_powerdns() {
   # Start service with command to make sure it's up before proceeding
   start_service_convert "pdnsadmin" "nc -z ${SERVICE_IP} 9494 &> /dev/null"
 
+  MYSQL_ROOTPASSWORD=`cat /federated/apps/pdnsmysql/.env | grep MYSQL_ROOT_PASSWORD | awk -F= '{ print $2 }'`
+  docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e \"update user set username='admin@$DOMAIN_NEW' where id='1';\""
+
   echo -ne "done."
 }
 convert_traefik() {
diff --git a/lib/files/panel/ldapusermanager-v1.10.tar.gz b/lib/files/panel/ldapusermanager-v1.10.tar.gz
deleted file mode 100644
index 47c5e20..0000000
Binary files a/lib/files/panel/ldapusermanager-v1.10.tar.gz and /dev/null differ
diff --git a/lib/files/panel/ldapusermanager-v1.11.tar.gz b/lib/files/panel/ldapusermanager-v1.11.tar.gz
new file mode 100644
index 0000000..739cab2
Binary files /dev/null and b/lib/files/panel/ldapusermanager-v1.11.tar.gz differ
diff --git a/lib/functions.sh b/lib/functions.sh
index 716d145..80bb49d 100644
--- a/lib/functions.sh
+++ b/lib/functions.sh
@@ -334,7 +334,7 @@ administrative privileges, but please be cautious.
 Additional documentation about the Panel service can be found at
 https://documentation.federated.computer/docs/core_applications/panel.
 <p>
-Username: admin<br>
+Username: admin@$DOMAIN<br>
 Password: as given above
 <p>
 <h4>Email</h4>
@@ -473,7 +473,7 @@ https://documentation.federated.computer/docs/core_applications/powerdns.
 <p>
 Only the admin user has access to this service.
 <p>
-Username: admin<br>
+Username: admin@$DOMAIN<br>
 Password: as given above<br>
 <p>
 <h4>Castopod: <a href="https://castopod.$DOMAIN/cp-auth/login">https://castopod.$DOMAIN/cp-auth/login</a></h4>
diff --git a/lib/panel.sh b/lib/panel.sh
index 83d2071..025dee0 100644
--- a/lib/panel.sh
+++ b/lib/panel.sh
@@ -48,7 +48,7 @@ tar zxvf /federated/lib/files/panel/ldapusermanager-* -C /federated/apps/panel/d
 LDAP_SECRET=`cat /federated/apps/ldap/.ldap.secret`
 
 cat > /federated/apps/panel/.env <<EOF
-IMAGE_VERSION="v1.10"
+IMAGE_VERSION="v1.11"
 SERVER_HOSTNAME=panel.$DOMAIN
 LDAP_URI=ldap://ldap.$DOMAIN
 LDAP_BASE_DN=dc=federatedcomputer,dc=cloud
@@ -61,6 +61,8 @@ LDAP_ACCOUNT_ADDITIONAL_ATTRIBUTES=mailEnabled:Mail Enabled:TRUE,mailAlias+:Emai
 EMAIL_DOMAIN=$DOMAIN
 ENFORCE_SAFE_SYSTEM_NAMES=false
 USERNAME_FORMAT={first_name}.{last_name}
+SITE_LOGIN_LDAP_ATTRIBUTE=mail
+SITE_LOGIN_FIELD_LABEL="Email Address"
 SITE_NAME=$COMPANY User Manager
 SMTP_HOSTNAME=mail.$DOMAIN
 SMTP_USERNAME=admin
diff --git a/lib/pdnsadmin.sh b/lib/pdnsadmin.sh
index 2e4b2b2..b92989d 100644
--- a/lib/pdnsadmin.sh
+++ b/lib/pdnsadmin.sh
@@ -44,7 +44,7 @@ EOF
 MYSQL_PASSWORD=`grep MYSQL_PASSWORD /federated/apps/pdnsmysql/.env | awk -F= '{ print $2 }'`
 PDNS_APIKEY=`grep PDNS_api_key /federated/apps/pdns/.env | awk -F= '{ print $2 }'`
 PDNS_ADMIN_WEBSERVER_PASSWORD_SALT=`htpasswd -bnBC 10 "" $ADMINPASS | tr -d ':\n' | sed 's/$2y/$2b/'`
-PDNS_MYSQL_COMMAND="insert into user (id, username, password, firstname, lastname, email, otp_secret, role_id, confirmed) values (\"1\", \"admin\", \"$PDNS_ADMIN_WEBSERVER_PASSWORD_SALT\", \"Admin\", \"Federated\", \"admin@$DOMAIN\", \"\", \"1\", \"0\");"
+PDNS_MYSQL_COMMAND="insert into user (id, username, password, firstname, lastname, email, otp_secret, role_id, confirmed) values (\"1\", \"admin@$DOMAIN\", \"$PDNS_ADMIN_WEBSERVER_PASSWORD_SALT\", \"Admin\", \"Federated\", \"admin@$DOMAIN\", \"\", \"1\", \"0\");"
 
 cat > /federated/apps/pdnsadmin/.env <<EOF
 IMAGE_VERSION="@sha256:d4bcc2cd76bd1711c1501555a8db3b932ad58425a4ecc362aac13e97b082d5c2"