diff --git a/lib/user.php b/lib/user.php
index 6144f0f6bf9..33e25268175 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -386,7 +386,7 @@ class OC_User {
 	 * generates a password
 	 */
 	public static function generatePassword() {
-		return uniqId();
+		return OC_Util::generate_random_bytes(30);
 	}
 
 	/**