diff --git a/lib/common.lib.php b/lib/common.lib.php
index 1d74cb403..7785a2cd2 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -3197,7 +3197,7 @@ class str_encrypt
     function __construct($salt='')
     {
         if(!$salt)
-            $this->salt = md5(G5_MYSQL_PASSWORD);
+            $this->salt = md5(preg_replace('/[^0-9A-Za-z]/', substr(G5_MYSQL_USER, -1), G5_MYSQL_PASSWORD));
         else
             $this->salt = $salt;