diff --git a/lib/LDAPConnect.php b/lib/LDAPConnect.php
index bf06f61a..501bb7ee 100644
--- a/lib/LDAPConnect.php
+++ b/lib/LDAPConnect.php
@@ -107,11 +107,19 @@ public function getLDAPConnection() {
 	}
 
 	public function getLDAPBaseUsers() {
-		return $this->ldapConfig->ldapBaseUsers;
+		$bases = $this->ldapConfig->ldapBaseUsers;
+		if(empty($bases)) {
+			$bases = $this->ldapConfig->ldapBase;
+		}
+		return $bases;
 	}
 
 	public function getLDAPBaseGroups() {
-		return $this->ldapConfig->ldapBaseGroups;
+		$bases = $this->ldapConfig->ldapBaseGroups;
+		if(empty($bases)) {
+			$bases = $this->ldapConfig->ldapBase;
+		}
+		return $bases;
 	}
 
 	public function getDisplayNameAttribute() {
diff --git a/tests/integration/features/user.feature b/tests/integration/features/user.feature
index 2c872bc1..a6f48bf7 100644
--- a/tests/integration/features/user.feature
+++ b/tests/integration/features/user.feature
@@ -34,6 +34,19 @@ Feature: user
     And the HTTP status code should be "200"
     And the created users resides on LDAP
 
+  # requires NC 17
+  Scenario: create a new user with dynamic user id without user base set
+    Given As an "admin"
+    And parameter "newUser.generateUserID" of app "core" is set to "yes"
+    And modify LDAP configuration
+      | ldapBaseUsers |  |
+    When creating a user with
+      | userid |  |
+      | password | 123456 |
+    Then the OCS status code should be "200"
+    And the HTTP status code should be "200"
+    And the created users resides on LDAP
+
   # requires NC 17
   Scenario: create a new user with dynamic user id
     Given As an "admin"