diff --git a/fstack/lib/nextcloud.sh b/fstack/lib/nextcloud.sh
index af96d06..c1392d0 100644
--- a/fstack/lib/nextcloud.sh
+++ b/fstack/lib/nextcloud.sh
@@ -16,9 +16,9 @@ config_nextcloud() {
     cp -rf fstack/dns/data/etc/letsencrypt/archive/$DOMAIN/*.pem fstack/nextcloud/data/root/certs/
   fi
 
-#  DOMAIN_ARRAY=(${DOMAIN//./ })
-#  DOMAIN_FIRST=${DOMAIN_ARRAY[0]}
-#  DOMAIN_LAST=${DOMAIN_ARRAY[1]}
+  DOMAIN_ARRAY=(${DOMAIN//./ })
+  DOMAIN_FIRST=${DOMAIN_ARRAY[0]}
+  DOMAIN_LAST=${DOMAIN_ARRAY[1]}
 
 cat > fstack/nextcloud/docker-compose.yml <<EOF
 version: '3.8'
@@ -72,7 +72,7 @@ cat > fstack/nextcloud/data/root/nextcloud.sh <<EOF
 ./occ ldap:set-config s01 ldapGroupFilterMode 0
 ./occ ldap:set-config s01 ldapGroupFilterObjectclass inetOrgPerson
 ./occ ldap:set-config s01 ldapGroupMemberAssocAttr gidNumber
-./occ ldap:set-config s01 ldapLoginFilter '(&(|(objectclass=inetOrgPerson))(uid=%uid))'
+./occ ldap:set-config s01 ldapLoginFilter '(&(|(objectclass=inetOrgPerson))(mail=%uid))'
 ./occ ldap:set-config s01 ldapLoginFilterEmail 0
 ./occ ldap:set-config s01 ldapLoginFilterMode 0
 ./occ ldap:set-config s01 ldapLoginFilterUsername 1
@@ -95,6 +95,9 @@ cat > fstack/nextcloud/data/root/nextcloud.sh <<EOF
 ./occ ldap:set-config s01 ldapConfigurationActive 1 
 ./occ config:system:delete trusted_domains
 ./occ config:system:set trusted_domains 1 --value=*
+ADMINUUID=\`./occ user:list | grep admin | awk '{ print \$2 }' | awk -F: '{ print \$1 }'\`
+./occ group:adduser admin \$ADMINUUID
+./occ user:delete nextcloud
 ./occ app:enable calendar
 ./occ app:enable contacts
 ./occ app:enable notes