diff --git a/README.md b/README.md
index 8479fe4..a5b15db 100644
--- a/README.md
+++ b/README.md
@@ -109,6 +109,9 @@ Ldap filter to find valid groups.
 ## LDAP_EMAIL_ATTRIBUTE
 Ldap attribute for the email.
 
+## LDAP_UID_ATTRIBUTE
+Ldap attribute for the user id.
+
 # Ports
 - 80
 
diff --git a/rootfs/etc/cont-init.d/00-nextcloud b/rootfs/etc/cont-init.d/00-nextcloud
index 762337a..d86580d 100644
--- a/rootfs/etc/cont-init.d/00-nextcloud
+++ b/rootfs/etc/cont-init.d/00-nextcloud
@@ -25,8 +25,9 @@ if [ $? -ne 1 ]; then
 fi
 
 s6-setuidgid nginx ./occ config:system:set --value "https://$DOMAIN" overwrite.cli.url
-s6-setuidgid nginx ./occ config:system:set --value ["localhost", "$DOMAIN"] trusted_domains
-    
+s6-setuidgid nginx ./occ config:system:set --value "localhost" trusted_domains 0
+s6-setuidgid nginx ./occ config:system:set --value "$DOMAIN" trusted_domains 1
+  
 s6-setuidgid nginx ./occ config:system:set --value "smtp" mail_smtpmode
 s6-setuidgid nginx ./occ config:system:set --value "${MAIL_SMTP_AUTH_TYPE:-PLAIN}" mail_smtpauthtype
 s6-setuidgid nginx ./occ config:system:set --value "$MAIL_FROM" mail_from_address
@@ -37,7 +38,8 @@ s6-setuidgid nginx ./occ config:system:set --value "$MAIL_SMTP_HOST" mail_smtpho
 s6-setuidgid nginx ./occ config:system:set --value "${MAIL_SMTP_PORT:-587}" mail_smtpport
 s6-setuidgid nginx ./occ config:system:set --value "$MAIL_SMTP_NAME" mail_smtpname
 s6-setuidgid nginx ./occ config:system:set --value "$MAIL_SMTP_PASSWORD" mail_smtppassword
-    
+
+s6-setuidgid nginx ./occ config:app:set --value "$LDAP_BASE_DN" user_ldap ldap_base
 s6-setuidgid nginx ./occ config:app:set --value "$LDAP_BASE_GROUP_DN" user_ldap ldap_base_groups
 s6-setuidgid nginx ./occ config:app:set --value "$LDAP_EMAIL_ATTRIBUTE" user_ldap ldap_email_attr
 s6-setuidgid nginx ./occ config:app:set --value "$LDAP_USER_FILTER" user_ldap ldap_userlist_filter
@@ -45,9 +47,10 @@ s6-setuidgid nginx ./occ config:app:set --value "$LDAP_LOGIN_FILTER" user_ldap l
 s6-setuidgid nginx ./occ config:app:set --value "$LDAP_TLS" user_ldap ldap_tls
 s6-setuidgid nginx ./occ config:app:set --value "$LDAP_HOST" user_ldap ldap_host
 s6-setuidgid nginx ./occ config:app:set --value "$LDAP_BIND_USER" user_ldap ldap_dn
-s6-setuidgid nginx ./occ config:app:set --value "$LDAP_BIND_PASSWORD" user_ldap ldap_agent_password
+s6-setuidgid nginx ./occ config:app:set --value "$(echo $LDAP_BIND_PASSWORD | base64)" user_ldap ldap_agent_password
 s6-setuidgid nginx ./occ config:app:set --value "$LDAP_GROUP_FILTER" user_ldap ldap_group_filter
 s6-setuidgid nginx ./occ config:app:set --value "$LDAP_USER_DISPLAY_NAME" user_ldap ldap_display_name
 s6-setuidgid nginx ./occ config:app:set --value "${LDAP_PORT:-389}" user_ldap ldap_port
 s6-setuidgid nginx ./occ config:app:set --value "$LDAP_BASE_USER_DN" user_ldap ldap_base_users
 s6-setuidgid nginx ./occ config:app:set --value "yes" user_ldap enabled
+s6-setuidgid nginx ./occ config:app:set --value "$LDAP_UID_ATTRIBUTE" user_ldap ldap_expert_username_attr