diff --git a/.env.example b/.env.example
index 009cc76f..490bfe87 100644
--- a/.env.example
+++ b/.env.example
@@ -15,7 +15,7 @@ DB_PREFIX=
 # Hash Algorithm for Passwords
 #
 # Available values:
-# - BCRYPT, PHP_PASSWORD_HASH
+# - BCRYPT, ARGON2I, PHP_PASSWORD_HASH
 # - MD5, SALTED2MD5
 # - SHA256, SALTED2SHA256
 # - SHA512, SALTED2SHA512
diff --git a/app/Services/Cipher/ARGON2I.php b/app/Services/Cipher/ARGON2I.php
new file mode 100644
index 00000000..8ed91947
--- /dev/null
+++ b/app/Services/Cipher/ARGON2I.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Services\Cipher;
+
+class ARGON2I extends BaseCipher
+{
+    public function hash($value, $salt = '')
+    {
+        return password_hash($value, PASSWORD_ARGON2I);
+    }
+
+    public function verify($password, $hash, $salt = '')
+    {
+        return password_verify($password, $hash);
+    }
+}
diff --git a/resources/misc/changelogs/en/5.0.0.md b/resources/misc/changelogs/en/5.0.0.md
index 0da23226..24b41ec4 100644
--- a/resources/misc/changelogs/en/5.0.0.md
+++ b/resources/misc/changelogs/en/5.0.0.md
@@ -17,6 +17,7 @@
 - Added FAQ link at error page.
 - Added login with 3rd-party services. (GitHub and Microsoft Live are supported currently.)
 - Added support of character "§" for player name. (Under CJK mode.)
+- New password hash algorithm: Argon2i.
 
 ## Tweaked
 
diff --git a/resources/misc/changelogs/zh_CN/5.0.0.md b/resources/misc/changelogs/zh_CN/5.0.0.md
index f218dfc6..9da4e279 100644
--- a/resources/misc/changelogs/zh_CN/5.0.0.md
+++ b/resources/misc/changelogs/zh_CN/5.0.0.md
@@ -17,6 +17,7 @@
 - 在错误页面增加指向 FAQ 页面的链接
 - 第三方登录（目前仅支持 GitHub 和 Microsoft Live）
 - 角色名支持字符「§」（需开启「CJK」模式）
+- 新的密码哈希算法：Argon2i
 
 ## 调整