diff --git a/sai/modules/saimod_sys_log/saimod_sys_log.php b/sai/modules/saimod_sys_log/saimod_sys_log.php
index aeb6e39..1a6bbcd 100644
--- a/sai/modules/saimod_sys_log/saimod_sys_log.php
+++ b/sai/modules/saimod_sys_log/saimod_sys_log.php
@@ -63,7 +63,7 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule {
                       <h3>Truncate table system.sys_log</h3>
                     </div>
                     <div class="modal-body">
-                      <p>This action will delete all error messages from databse. <br />
+                      <p>This action will delete all error messages from database. <br />
                          Are you sure?</p>
                       <span id="info_box" />
                     </div>
diff --git a/sai/modules/saimod_sys_login/sai_sys_login_submit.js b/sai/modules/saimod_sys_login/sai_sys_login_submit.js
index f4241d4..ca1de7c 100644
--- a/sai/modules/saimod_sys_login/sai_sys_login_submit.js
+++ b/sai/modules/saimod_sys_login/sai_sys_login_submit.js
@@ -3,8 +3,8 @@ function init__SYSTEM_SAI_saimod_sys_login() {
         $("#login_form input").not("[type=submit]").jqBootstrapValidation({    
             preventSubmit: true,            
             submitError: function($form, event, errors) {},
-            submitSuccess: function($form, event){                                      
-                $.get('./api.php?call=account&action=login&username='+$('#bt_login_user').val()+'&password_sha='+$.sha1($('#bt_login_password').val())+'&password_md5='+hex_md5($('#bt_login_password').val()), function (data) {
+            submitSuccess: function($form, event){                             
+                $.get('./api.php?call=account&action=login&username='+$('#bt_login_user').val()+'&password_sha='+$.sha1($('#bt_login_password').val())+'&password_md5='+$.md5($('#bt_login_password').val()), function (data) {
                     if(data == 1){                        
                         $('.help-block').html("Login successfull.</br>");
                         location.reload(true);                        
diff --git a/sai/modules/saimod_sys_login/saimod_sys_login.php b/sai/modules/saimod_sys_login/saimod_sys_login.php
index 20572ae..d8d50e8 100644
--- a/sai/modules/saimod_sys_login/saimod_sys_login.php
+++ b/sai/modules/saimod_sys_login/saimod_sys_login.php
@@ -32,7 +32,7 @@ class saimod_sys_login extends \SYSTEM\SAI\SaiModule {
     public static function src_js(){return \SYSTEM\LOG\JsonResult::toString(
                                     array(  \SYSTEM\WEBPATH(new \PPAGE(),'default_page/js/jqBootstrapValidation.js'),
                                             \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_login/sai_sys_login_submit.js'),
-                                            \SYSTEM\WEBPATH(new \PPAGE(),'default_page/js/crypto/md5.js'),
+                                            \SYSTEM\WEBPATH(new \PPAGE(),'default_page/js/crypto/jquery.md5.js'),
                                             \SYSTEM\WEBPATH(new \PPAGE(),'default_page/js/crypto/jquery.sha1.js')
                                             ));}
 }
\ No newline at end of file
diff --git a/security/Security.php b/security/Security.php
index 06b033c..155b2c7 100644
--- a/security/Security.php
+++ b/security/Security.php
@@ -112,7 +112,8 @@ class Security {
                                         time(),
                                         getenv('REMOTE_ADDR'),
                                         0,
-                                        NULL);
+                                        NULL,
+                                        $row[\SYSTEM\DBD\UserTable::FIELD_LOCALE]);
         
         if(isset($locale)){
             \SYSTEM\locale::set($locale);}
@@ -224,7 +225,7 @@ class Security {
                  
         $con = new \SYSTEM\DB\Connection($dbinfo);
         $res = $con->prepare(   'updateUserLocaleStmt',
-                                'UPDATE '.\SYSTEM\DBD\UserTable::NAME.' SET '.\SYSTEM\DBD\UserTable::FIELD_LOCALE.' = $1 '.
+                                'UPDATE '.(\SYSTEM\system::isSystemDbInfoPG() ? \SYSTEM\DBD\UserTable::NAME_PG : \SYSTEM\DBD\UserTable::NAME_MYS).' SET '.\SYSTEM\DBD\UserTable::FIELD_LOCALE.' = $1 '.
                                 'WHERE '.\SYSTEM\DBD\UserTable::FIELD_ID.' = $2'.' RETURNING '.\SYSTEM\DBD\UserTable::FIELD_LOCALE.';', 
                                 array($lang, $user->id));
         if(!$res->next()){
diff --git a/security/User.php b/security/User.php
index 13861df..5cc025c 100644
--- a/security/User.php
+++ b/security/User.php
@@ -12,8 +12,9 @@ class User {
     public $lastLoginIP = NULL;
     public $passwordWrongCount = NULL;
     public $rights = NULL;
+    public $locale = NULL;
 
-    public function __construct($id, $username, $email, $creationDate, $lastLoginDate, $lastLoginIP, $passwordWrongCount, $rights){
+    public function __construct($id, $username, $email, $creationDate, $lastLoginDate, $lastLoginIP, $passwordWrongCount, $rights, $locale){
         $this->id = $id;
         $this->username = $username;
         $this->email = $email;
@@ -22,5 +23,6 @@ class User {
         $this->lastLoginIP = $lastLoginIP;
         $this->passwordWrongCount = $passwordWrongCount;
         $this->rights = $rights;
+        $this->locale = $locale;
     }
 }
\ No newline at end of file
diff --git a/system/locale.php b/system/locale.php
index 69e95f4..fef81d2 100644
--- a/system/locale.php
+++ b/system/locale.php
@@ -15,7 +15,7 @@ class locale {
 
         \SYSTEM\SECURITY\Security::save(self::SESSION_KEY, $lang);        
         if(\SYSTEM\SECURITY\Security::isLoggedIn()){
-            \SYSTEM\SECURITY\Security::_db_setLocale(new \SYSTEM\DBD\systemPostgres(), $lang);} //TODO: connection def move somewhere?        
+            \SYSTEM\SECURITY\Security::_db_setLocale(\SYSTEM\system::getSystemDBInfo(), $lang);} //TODO: connection def move somewhere?        
             
         return true;
     }