diff --git a/ajax.php b/ajax.php
index c13fd60a..856e4402 100644
--- a/ajax.php
+++ b/ajax.php
@@ -239,8 +239,8 @@ if(isset($_GET['share_generate_link'])){
 
     // Decrypt & re-encrypt password for sharing
     $login_password_cleartext = decryptLoginEntry($row['login_password']);
-    $login_encryption_key = keygen();
-    $iv = keygen();
+    $login_encryption_key = bin2hex(random_bytes(8));
+    $iv = bin2hex(random_bytes(8));
     $ciphertext = openssl_encrypt($login_password_cleartext, 'aes-128-cbc', $login_encryption_key, 0, $iv);
 
     $item_encrypted_credential = $iv . $ciphertext;
diff --git a/api_key_add_modal.php b/api_key_add_modal.php
index 8dc9d648..9253d568 100644
--- a/api_key_add_modal.php
+++ b/api_key_add_modal.php
@@ -1,5 +1,5 @@
 <?php
-$key = keygen();
+$key = bin2hex(random_bytes(78));
 ?>
 <div class="modal" id="addApiKeyModal" tabindex="-1">
   <div class="modal-dialog">
diff --git a/blank.php b/blank.php
index d390c4ea..a966e579 100644
--- a/blank.php
+++ b/blank.php
@@ -14,6 +14,11 @@
 <p>This is a great starting point for new custom pages.</p>
 
 <?php echo CURRENT_DATABASE_VERSION; ?>
+<br>
+
+<?php echo bin2hex(random_bytes(8)); ?>
+<br>
+<?php echo keygen(); ?>
 
 <script>toastr.success('Have Fun Wozz!!')</script>
 
diff --git a/functions.php b/functions.php
index 5305086a..c52d6330 100644
--- a/functions.php
+++ b/functions.php
@@ -236,8 +236,8 @@ function mkdir_missing($dir) {
 // Called during initial setup
 // Encrypts the master key with the user's password
 function setupFirstUserSpecificKey($user_password, $site_encryption_master_key){
-  $iv = keygen();
-  $salt = keygen();
+  $iv = bin2hex(random_bytes(8));
+  $salt = bin2hex(random_bytes(8));
 
   //Generate 128-bit (16 byte/char) kdhash of the users password
   $user_password_kdhash = hash_pbkdf2('sha256', $user_password, $salt, 100000, 16);
@@ -256,8 +256,8 @@ function setupFirstUserSpecificKey($user_password, $site_encryption_master_key){
  * Password Changes: Will use the current info in the session.
 */
 function encryptUserSpecificKey($user_password){
-  $iv = keygen();
-  $salt = keygen();
+  $iv = bin2hex(random_bytes(8));
+  $salt = bin2hex(random_bytes(8));
 
   // Get the session info.
   $user_encryption_session_ciphertext = $_SESSION['user_encryption_session_ciphertext'];
@@ -304,9 +304,9 @@ Generates what is probably best described as a session key (ephemeral-ish)
 */
 function generateUserSessionKey($site_encryption_master_key){
 
-  // Generate both of these using keygen()
-  $user_encryption_session_key = keygen();
-  $user_encryption_session_iv = keygen();
+  // Generate both of these using bin2hex(random_bytes(8))
+  $user_encryption_session_key = bin2hex(random_bytes(8));
+  $user_encryption_session_iv = bin2hex(random_bytes(8));
   $user_encryption_session_ciphertext = openssl_encrypt($site_encryption_master_key, 'aes-128-cbc', $user_encryption_session_key, 0, $user_encryption_session_iv);
 
   // Store ciphertext in the user's session
@@ -346,7 +346,7 @@ function decryptLoginEntry($login_password_ciphertext){
 
 // Encrypts a website/asset login password
 function encryptLoginEntry($login_password_cleartext){
-  $iv = keygen();
+  $iv = bin2hex(random_bytes(8));
 
   // Get the user session info.
   $user_encryption_session_ciphertext = $_SESSION['user_encryption_session_ciphertext'];
diff --git a/login.php b/login.php
index 0522a6db..522d63af 100644
--- a/login.php
+++ b/login.php
@@ -66,7 +66,7 @@ if(isset($_POST['login'])){
             $_SESSION['user_id'] = $row['user_id'];
             $_SESSION['user_name'] = $row['user_name'];
             $_SESSION['user_role'] = $row['user_role'];
-            $_SESSION['csrf_token'] = keygen();
+            $_SESSION['csrf_token'] = bin2hex(random_bytes(78));
 
             // Setup encryption session key
             if (isset($row['user_specific_encryption_ciphertext']) && $row['user_role'] > 1) {
diff --git a/post.php b/post.php
index 1cc3f48a..d87c2559 100644
--- a/post.php
+++ b/post.php
@@ -384,7 +384,7 @@ if(isset($_GET['archive_user'])){
 
     // Variables from GET
     $user_id = intval($_GET['archive_user']);
-    $password = password_hash(key32gen(), PASSWORD_DEFAULT);
+    $password = password_hash(bin2hex(random_bytes(16)), PASSWORD_DEFAULT);
 
     // Get user details
     $sql = mysqli_query($mysqli,"SELECT * FROM users WHERE user_id = $user_id");
@@ -3855,7 +3855,7 @@ if(isset($_POST['add_contact'])){
     $notes = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['notes'])));
     $location_id = intval($_POST['location']);
     $auth_method = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['auth_method'])));
-    $password = password_hash(keygen(), PASSWORD_DEFAULT);
+    $password = password_hash(bin2hex(random_bytes(16)), PASSWORD_DEFAULT);
 
 
   if(!file_exists("uploads/clients/$session_company_id/$client_id")) {