diff --git a/cms/config/sql/mysql.initial.sql b/cms/config/sql/mysql.initial.sql
index 5f79f29..86a93f4 100644
--- a/cms/config/sql/mysql.initial.sql
+++ b/cms/config/sql/mysql.initial.sql
@@ -263,4 +263,4 @@ INSERT INTO phpsqlitecms_settings (name, value) VALUES ('admin_language', 'engli
 INSERT INTO phpsqlitecms_settings (name, value) VALUES ('default_page_language', 'english');
 INSERT INTO phpsqlitecms_settings (name, value) VALUES ('caching', '0');
 INSERT INTO phpsqlitecms_settings (name, value) VALUES ('wysiwyg_editor', '0');
-INSERT INTO phpsqlitecms_userdata (name, type, pw, last_login, wysiwyg) VALUES('admin', 1, '75470d05abd21fb5e84e735d2bc595e2f7ecc5c7a5e98ad0d7', 1230764400, 0);
+INSERT INTO phpsqlitecms_userdata (name, type, pw, last_login, wysiwyg) VALUES('admin', 1, '$6$rounds=5000$56748f4e35e993f6$nW05WLxf2aJGdiALJktlCvzrAXdxlvMLhRUmNAw1W42tqVLXoS0AGRrM41.sSRp3PrYpg4qsjOHGN22jKzPxA0', 1230764400, 0);
diff --git a/cms/config/sql/postgresql.initial.sql b/cms/config/sql/postgresql.initial.sql
index 137cbbb..48aa497 100644
--- a/cms/config/sql/postgresql.initial.sql
+++ b/cms/config/sql/postgresql.initial.sql
@@ -260,4 +260,4 @@ INSERT INTO phpsqlitecms_settings (name, value) VALUES ('default_page_language',
 INSERT INTO phpsqlitecms_settings (name, value) VALUES ('caching', '0');
 INSERT INTO phpsqlitecms_settings (name, value) VALUES ('wysiwyg_editor', '0');
 
-INSERT INTO phpsqlitecms_userdata (name, type, pw, last_login, wysiwyg) VALUES('admin', 1, '75470d05abd21fb5e84e735d2bc595e2f7ecc5c7a5e98ad0d7', 1230764400, 0);
+INSERT INTO phpsqlitecms_userdata (name, type, pw, last_login, wysiwyg) VALUES('admin', 1, '$6$rounds=5000$56748f4e35e993f6$nW05WLxf2aJGdiALJktlCvzrAXdxlvMLhRUmNAw1W42tqVLXoS0AGRrM41.sSRp3PrYpg4qsjOHGN22jKzPxA0', 1230764400, 0);
diff --git a/cms/data/content.sqlite b/cms/data/content.sqlite
index e4e78eb..0aa3a88 100644
Binary files a/cms/data/content.sqlite and b/cms/data/content.sqlite differ
diff --git a/cms/data/userdata.sqlite b/cms/data/userdata.sqlite
index 57aaa8b..ea8afa2 100644
Binary files a/cms/data/userdata.sqlite and b/cms/data/userdata.sqlite differ
diff --git a/cms/includes/functions.admin.inc.php b/cms/includes/functions.admin.inc.php
index 570ef14..ba34e9a 100644
--- a/cms/includes/functions.admin.inc.php
+++ b/cms/includes/functions.admin.inc.php
@@ -7,10 +7,9 @@
  */
 function generate_pw_hash($pw)
  {
-  $salt = random_string(10,'0123456789abcdef');
-  $salted_hash = sha1($pw.$salt);
-  $hash_with_salt = $salted_hash.$salt;
-  return $hash_with_salt;
+  $salt = bin2hex(openssl_random_pseudo_bytes(22));
+  $hash = crypt($pw, '$6$rounds=5000$'.$salt.'$');
+  return $hash;
  }
 
 /**
@@ -29,6 +28,7 @@ function is_pw_correct($pw,$hash)
     if(sha1($pw.$salt)==$salted_hash) return true;
     else return false;
    }
+  elseif(crypt($pw, $hash) == $hash) return true;
   else return false;
  }