diff --git a/lib/functions.sh b/lib/functions.sh
index d8ab493..65ab256 100644
--- a/lib/functions.sh
+++ b/lib/functions.sh
@@ -1684,6 +1684,8 @@ Here are the credentials for that user.
 Username = "admin@$DOMAIN"<br>
 Password = "$ADMINPASS"
 <p>
+IMPORTANT: When logging into Nextcloud using normal login (NOT Login with Authelia), you need to use the system username from panel, not user@domain.com. This includes the admin user.
+<p>
 <h4>Dashboard</h4>
 Visit <a href="https://dashboard.$DOMAIN">https://dashboard.$DOMAIN</a> to access all of your applications using the admin user and password above.
 You can use dashboard as a launching pad for your applications.
diff --git a/lib/nextcloud.sh b/lib/nextcloud.sh
index 015388a..8fa9878 100644
--- a/lib/nextcloud.sh
+++ b/lib/nextcloud.sh
@@ -218,7 +218,7 @@ PATH=/var/www/html:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/sbin:/bin
 /var/www/html/occ ldap:set-config s01 ldapGroupFilterMode 0
 /var/www/html/occ ldap:set-config s01 ldapGroupFilterObjectclass inetOrgPerson
 /var/www/html/occ ldap:set-config s01 ldapGroupMemberAssocAttr uniqueMember
-/var/www/html/occ ldap:set-config s01 ldapLoginFilter '(&(|(objectclass=inetOrgPerson))(mail=%uid))'
+/var/www/html/occ ldap:set-config s01 ldapLoginFilter '(&(|(objectclass=inetOrgPerson))(uid=%uid))'
 /var/www/html/occ ldap:set-config s01 ldapLoginFilterEmail 0
 /var/www/html/occ ldap:set-config s01 ldapLoginFilterMode 0
 /var/www/html/occ ldap:set-config s01 ldapLoginFilterUsername 1