diff --git a/lib/base.php b/lib/base.php
index 1a99835040..18331dd86a 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -943,7 +943,7 @@ class OC {
 				if (defined("DEBUG") && DEBUG) {
 					OC_Log::write('core', 'Setting remember login to cookie', OC_Log::DEBUG);
 				}
-				$token = OC_Util::generateRandomBytes(32);
+				$token = \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate(32);
 				OC_Preferences::setValue($userid, 'login_token', $token, time());
 				OC_User::setMagicInCookie($userid, $token);
 			} else {
diff --git a/lib/private/user.php b/lib/private/user.php
index 509a7c7120..a79fc2ce83 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -428,7 +428,7 @@ class OC_User {
 	 * generates a password
 	 */
 	public static function generatePassword() {
-		return OC_Util::generateRandomBytes(30);
+		return \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate(30);
 	}
 
 	/**
diff --git a/lib/private/user/session.php b/lib/private/user/session.php
index 11938db507..5517e08a25 100644
--- a/lib/private/user/session.php
+++ b/lib/private/user/session.php
@@ -234,7 +234,7 @@ class Session implements IUserSession, Emitter {
 		}
 		// replace successfully used token with a new one
 		\OC_Preferences::deleteKey($uid, 'login_token', $currentToken);
-		$newToken = \OC_Util::generateRandomBytes(32);
+		$newToken = \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate(32);
 		\OC_Preferences::setValue($uid, 'login_token', $newToken, time());
 		$this->setMagicInCookie($user->getUID(), $newToken);
 
diff --git a/lib/private/util.php b/lib/private/util.php
index bc20b7bcd5..94508e502e 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -940,7 +940,7 @@ class OC_Util {
 		// Check if a token exists
 		if (!\OC::$server->getSession()->exists('requesttoken')) {
 			// No valid token found, generate a new one.
-			$requestToken = self::generateRandomBytes(20);
+			$requestToken = \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate(30);
 			\OC::$server->getSession()->set('requesttoken', $requestToken);
 		} else {
 			// Valid token already exists, send it