diff --git a/tine20/Tinebase/User/ActiveDirectory.php b/tine20/Tinebase/User/ActiveDirectory.php
index 1ee382f38fb..8187362e1b9 100644
--- a/tine20/Tinebase/User/ActiveDirectory.php
+++ b/tine20/Tinebase/User/ActiveDirectory.php
@@ -137,7 +137,9 @@ public function addUserToSyncBackend(Tinebase_Model_FullUser $_user)
             unset($ldapData[$this->_userUUIDAttribute]);
         }
 
-        $ldapData = array_merge($ldapData, $this->getLdapPasswordData(Tinebase_Record_Abstract::generateUID(20)));
+        $ldapData = array_merge($ldapData, $this->getLdapPasswordData(
+            Tinebase_User_PasswordPolicy::generatePolicyConformPassword())
+        );
 
         // will be added later
         $primaryGroupId = $ldapData['primarygroupid'];
diff --git a/tine20/Tinebase/User/PasswordPolicy.php b/tine20/Tinebase/User/PasswordPolicy.php
index 8a5174540ac..67c79af7710 100644
--- a/tine20/Tinebase/User/PasswordPolicy.php
+++ b/tine20/Tinebase/User/PasswordPolicy.php
@@ -24,7 +24,7 @@ public static function generatePolicyConformPassword(array $policies = []): stri
 
         if (!array_key_exists(Tinebase_Config::PASSWORD_POLICY_MIN_LENGTH, $policies)) {
             $policies[Tinebase_Config::PASSWORD_POLICY_MIN_LENGTH] = Tinebase_Config::getInstance()
-                ->{Tinebase_Config::USER_PASSWORD_POLICY}->{Tinebase_Config::PASSWORD_POLICY_MIN_LENGTH} ?: 6;
+                ->{Tinebase_Config::USER_PASSWORD_POLICY}->{Tinebase_Config::PASSWORD_POLICY_MIN_LENGTH} ?: 16;
         }
 
         if (!array_key_exists(Tinebase_Config::PASSWORD_POLICY_MIN_UPPERCASE_CHARS, $policies)) {