diff --git a/docs/content/users.md b/docs/content/users.md
index 536810aae3..2950269cf4 100644
--- a/docs/content/users.md
+++ b/docs/content/users.md
@@ -36,8 +36,8 @@ If the below defaults don't match your environment change them accordingly:
 export REVA_LDAP_HOSTNAME=localhost
 export REVA_LDAP_PORT=389
 export REVA_LDAP_BASE_DN='dc=owncloud,dc=com'
-export REVA_LDAP_USERFILTER='(objectclass=posixAccount)'
-export REVA_LDAP_GROUPFILTER='(objectclass=posixGroup)'
+export REVA_LDAP_USERFILTER='(&(objectclass=posixAccount)(cn=%s))'
+export REVA_LDAP_GROUPFILTER='(&(objectclass=posixGroup)(cn=%s))'
 export REVA_LDAP_BIND_DN='cn=admin,dc=owncloud,dc=com'
 export REVA_LDAP_BIND_PASSWORD=admin
 export REVA_LDAP_SCHEMA_UID=uid
diff --git a/pkg/flagset/authbasic.go b/pkg/flagset/authbasic.go
index 5a495a8d2b..13402d78f3 100644
--- a/pkg/flagset/authbasic.go
+++ b/pkg/flagset/authbasic.go
@@ -110,7 +110,7 @@ func AuthBasicWithConfig(cfg *config.Config) []cli.Flag {
 		},
 		&cli.IntFlag{
 			Name:        "ldap-port",
-			Value:       389,
+			Value:       636,
 			Usage:       "LDAP port",
 			EnvVar:      "REVA_LDAP_PORT",
 			Destination: &cfg.Reva.LDAP.Port,
@@ -124,14 +124,14 @@ func AuthBasicWithConfig(cfg *config.Config) []cli.Flag {
 		},
 		&cli.StringFlag{
 			Name:        "ldap-userfilter",
-			Value:       "(objectclass=posixAccount)",
+			Value:       "(&(objectclass=posixAccount)(cn=%s))",
 			Usage:       "LDAP userfilter",
 			EnvVar:      "REVA_LDAP_USERFILTER",
 			Destination: &cfg.Reva.LDAP.UserFilter,
 		},
 		&cli.StringFlag{
 			Name:        "ldap-groupfilter",
-			Value:       "(objectclass=posixGroup)",
+			Value:       "(&(objectclass=posixGroup)(cn=%s))",
 			Usage:       "LDAP groupfilter",
 			EnvVar:      "REVA_LDAP_GROUPFILTER",
 			Destination: &cfg.Reva.LDAP.GroupFilter,
diff --git a/pkg/flagset/users.go b/pkg/flagset/users.go
index 76d8670575..523cd265da 100644
--- a/pkg/flagset/users.go
+++ b/pkg/flagset/users.go
@@ -93,7 +93,7 @@ func UsersWithConfig(cfg *config.Config) []cli.Flag {
 		},
 		&cli.IntFlag{
 			Name:        "ldap-port",
-			Value:       389,
+			Value:       636,
 			Usage:       "LDAP port",
 			EnvVar:      "REVA_LDAP_PORT",
 			Destination: &cfg.Reva.LDAP.Port,
@@ -107,14 +107,14 @@ func UsersWithConfig(cfg *config.Config) []cli.Flag {
 		},
 		&cli.StringFlag{
 			Name:        "ldap-userfilter",
-			Value:       "(objectclass=posixAccount)",
+			Value:       "(&(objectclass=posixAccount)(cn=%s))",
 			Usage:       "LDAP userfilter",
 			EnvVar:      "REVA_LDAP_USERFILTER",
 			Destination: &cfg.Reva.LDAP.UserFilter,
 		},
 		&cli.StringFlag{
 			Name:        "ldap-groupfilter",
-			Value:       "(objectclass=posixGroup)",
+			Value:       "(&(objectclass=posixGroup)(cn=%s))",
 			Usage:       "LDAP groupfilter",
 			EnvVar:      "REVA_LDAP_GROUPFILTER",
 			Destination: &cfg.Reva.LDAP.GroupFilter,