diff --git a/library/OAuth1.php b/library/OAuth1.php
index 723f6592ed..e3ca246467 100644
--- a/library/OAuth1.php
+++ b/library/OAuth1.php
@@ -528,7 +528,7 @@ class OAuthRequest
    */
   private static function generate_nonce()
   {
-    return bin2hex(random_bytes(16));
+    return Friendica\Util\Strings::getRandomHex(32);
   }
 }
 
diff --git a/src/Network/FKOAuthDataStore.php b/src/Network/FKOAuthDataStore.php
index 9fba89685d..e3ee68d9c7 100644
--- a/src/Network/FKOAuthDataStore.php
+++ b/src/Network/FKOAuthDataStore.php
@@ -29,7 +29,7 @@ class FKOAuthDataStore extends OAuthDataStore
 	 */
 	private static function genToken()
 	{
-		return bin2hex(random_bytes(16));
+		return Friendica\Util\Strings::getRandomHex(32);
 	}
 
 	/**