diff --git a/inc/mod/auth.php b/inc/mod/auth.php
index 01b234a1..326f6f53 100644
--- a/inc/mod/auth.php
+++ b/inc/mod/auth.php
@@ -5,7 +5,7 @@
  */
 
 use Vichan\Context;
-use Vichan\Functions\Net;
+use Vichan\Functions\{Hide, Net};
 
 defined('TINYBOARD') or exit;
 
@@ -14,30 +14,32 @@ function mkhash($username, $password, $salt = false) {
 	global $config;
 
 	if (!$salt) {
-		// create some sort of salt for the hash
-		$salt = substr(base64_encode(sha1(rand() . time(), true) . $config['cookies']['salt']), 0, 15);
-
+		// Create some salt for the hash.
+		$salt = \bin2hex(\random_bytes(15)); // 20 characters.
 		$generated_salt = true;
+	} else {
+		$generated_salt = false;
 	}
 
 	// generate hash (method is not important as long as it's strong)
-	$hash = substr(
-		base64_encode(
-			md5(
-				$username . $config['cookies']['salt'] . sha1(
-					$username . $password . $salt . (
-						$config['mod']['lock_ip'] ? $_SERVER['REMOTE_ADDR'] : ''
-					), true
-				) . sha1($config['password_crypt_version']) // Log out users being logged in with older password encryption schema
-				, true
-			)
-		), 0, 20
+	$hash = \substr(
+		Hide\secure_hash(
+			$username . $config['cookies']['salt'] . Hide\secure_hash(
+				$username . $password . $salt . (
+					$config['mod']['lock_ip'] ? $_SERVER['REMOTE_ADDR'] : ''
+				), true
+			) . Hide\secure_hash($config['password_crypt_version'], true), // Log out users being logged in with older password encryption schema
+			false
+		),
+		0,
+		40
 	);
 
-	if (isset($generated_salt))
-		return array($hash, $salt);
-	else
+	if ($generated_salt) {
+		return [ $hash, $salt ];
+	} else {
 		return $hash;
+	}
 }
 
 function crypt_password($password) {
@@ -50,16 +52,13 @@ function crypt_password($password) {
 }
 
 function test_password($password, $salt, $test) {
-	global $config;
-
 	// Version = 0 denotes an old password hashing schema. In the same column, the
 	// password hash was kept previously
 	$version = (strlen($salt) <= 8) ? (int) $salt : 0;
 
 	if ($version == 0) {
 		$comp = hash('sha256', $salt . sha1($test));
-	}
-	else {
+	} else {
 		$comp = crypt($test, $password);
 	}
 	return array($version, hash_equals($password, $comp));