diff --git a/controllers/user.go b/controllers/user.go
index 46b5b4ee..ce589a45 100644
--- a/controllers/user.go
+++ b/controllers/user.go
@@ -410,10 +410,6 @@ func (c *ApiController) SetPassword() {
 		c.ResponseError(c.T("user:New password cannot contain blank space."))
 		return
 	}
-	if len(newPassword) <= 5 {
-		c.ResponseError(c.T("user:New password must have at least 6 characters"))
-		return
-	}
 
 	userId := util.GetId(userOwner, userName)
 
diff --git a/i18n/locales/de/data.json b/i18n/locales/de/data.json
index 0f4b327f..a3147e67 100644
--- a/i18n/locales/de/data.json
+++ b/i18n/locales/de/data.json
@@ -120,8 +120,7 @@
   },
   "user": {
     "Display name cannot be empty": "Anzeigename darf nicht leer sein",
-    "New password cannot contain blank space.": "Das neue Passwort darf keine Leerzeichen enthalten.",
-    "New password must have at least 6 characters": "Das neue Passwort muss mindestens 6 Zeichen haben"
+    "New password cannot contain blank space.": "Das neue Passwort darf keine Leerzeichen enthalten."
   },
   "user_upload": {
     "Failed to import users": "Fehler beim Importieren von Benutzern"
diff --git a/i18n/locales/en/data.json b/i18n/locales/en/data.json
index 741b7095..f8680069 100644
--- a/i18n/locales/en/data.json
+++ b/i18n/locales/en/data.json
@@ -120,8 +120,7 @@
   },
   "user": {
     "Display name cannot be empty": "Display name cannot be empty",
-    "New password cannot contain blank space.": "New password cannot contain blank space.",
-    "New password must have at least 6 characters": "New password must have at least 6 characters"
+    "New password cannot contain blank space.": "New password cannot contain blank space."
   },
   "user_upload": {
     "Failed to import users": "Failed to import users"
diff --git a/i18n/locales/es/data.json b/i18n/locales/es/data.json
index 5cca37ab..1be02021 100644
--- a/i18n/locales/es/data.json
+++ b/i18n/locales/es/data.json
@@ -120,8 +120,7 @@
   },
   "user": {
     "Display name cannot be empty": "El nombre de pantalla no puede estar vacío",
-    "New password cannot contain blank space.": "La nueva contraseña no puede contener espacios en blanco.",
-    "New password must have at least 6 characters": "La nueva contraseña debe tener al menos 6 caracteres"
+    "New password cannot contain blank space.": "La nueva contraseña no puede contener espacios en blanco."
   },
   "user_upload": {
     "Failed to import users": "Error al importar usuarios"
diff --git a/i18n/locales/fr/data.json b/i18n/locales/fr/data.json
index 0ec61491..6c92de0c 100644
--- a/i18n/locales/fr/data.json
+++ b/i18n/locales/fr/data.json
@@ -120,8 +120,7 @@
   },
   "user": {
     "Display name cannot be empty": "Le nom d'affichage ne peut pas être vide",
-    "New password cannot contain blank space.": "Le nouveau mot de passe ne peut pas contenir d'espace.",
-    "New password must have at least 6 characters": "Le nouveau mot de passe doit comporter au moins 6 caractères"
+    "New password cannot contain blank space.": "Le nouveau mot de passe ne peut pas contenir d'espace."
   },
   "user_upload": {
     "Failed to import users": "Échec de l'importation des utilisateurs"
diff --git a/i18n/locales/id/data.json b/i18n/locales/id/data.json
index eb9f2ba7..2363b82f 100644
--- a/i18n/locales/id/data.json
+++ b/i18n/locales/id/data.json
@@ -120,8 +120,7 @@
   },
   "user": {
     "Display name cannot be empty": "Nama tampilan tidak boleh kosong",
-    "New password cannot contain blank space.": "Kata sandi baru tidak boleh mengandung spasi kosong.",
-    "New password must have at least 6 characters": "Kata sandi baru harus memiliki setidaknya 6 karakter"
+    "New password cannot contain blank space.": "Kata sandi baru tidak boleh mengandung spasi kosong."
   },
   "user_upload": {
     "Failed to import users": "Gagal mengimpor pengguna"
diff --git a/i18n/locales/ja/data.json b/i18n/locales/ja/data.json
index 0722ff27..f6e9a70d 100644
--- a/i18n/locales/ja/data.json
+++ b/i18n/locales/ja/data.json
@@ -120,8 +120,7 @@
   },
   "user": {
     "Display name cannot be empty": "表示名は空にできません",
-    "New password cannot contain blank space.": "新しいパスワードにはスペースを含めることはできません。",
-    "New password must have at least 6 characters": "新しいパスワードは少なくとも6文字必要です"
+    "New password cannot contain blank space.": "新しいパスワードにはスペースを含めることはできません。"
   },
   "user_upload": {
     "Failed to import users": "ユーザーのインポートに失敗しました"
diff --git a/i18n/locales/ko/data.json b/i18n/locales/ko/data.json
index 36e992e4..3320bda0 100644
--- a/i18n/locales/ko/data.json
+++ b/i18n/locales/ko/data.json
@@ -120,8 +120,7 @@
   },
   "user": {
     "Display name cannot be empty": "디스플레이 이름은 비어 있을 수 없습니다",
-    "New password cannot contain blank space.": "새 비밀번호에는 공백이 포함될 수 없습니다.",
-    "New password must have at least 6 characters": "새로운 비밀번호는 최소 6자 이상이어야 합니다"
+    "New password cannot contain blank space.": "새 비밀번호에는 공백이 포함될 수 없습니다."
   },
   "user_upload": {
     "Failed to import users": "사용자 가져오기를 실패했습니다"
diff --git a/i18n/locales/pt/data.json b/i18n/locales/pt/data.json
index 741b7095..f8680069 100644
--- a/i18n/locales/pt/data.json
+++ b/i18n/locales/pt/data.json
@@ -120,8 +120,7 @@
   },
   "user": {
     "Display name cannot be empty": "Display name cannot be empty",
-    "New password cannot contain blank space.": "New password cannot contain blank space.",
-    "New password must have at least 6 characters": "New password must have at least 6 characters"
+    "New password cannot contain blank space.": "New password cannot contain blank space."
   },
   "user_upload": {
     "Failed to import users": "Failed to import users"
diff --git a/i18n/locales/ru/data.json b/i18n/locales/ru/data.json
index 3a5c5be3..f541c6ef 100644
--- a/i18n/locales/ru/data.json
+++ b/i18n/locales/ru/data.json
@@ -120,8 +120,7 @@
   },
   "user": {
     "Display name cannot be empty": "Отображаемое имя не может быть пустым",
-    "New password cannot contain blank space.": "Новый пароль не может содержать пробелы.",
-    "New password must have at least 6 characters": "Новый пароль должен содержать не менее 6 символов"
+    "New password cannot contain blank space.": "Новый пароль не может содержать пробелы."
   },
   "user_upload": {
     "Failed to import users": "Не удалось импортировать пользователей"
diff --git a/i18n/locales/vi/data.json b/i18n/locales/vi/data.json
index 9fb875c9..5f28c04b 100644
--- a/i18n/locales/vi/data.json
+++ b/i18n/locales/vi/data.json
@@ -120,8 +120,7 @@
   },
   "user": {
     "Display name cannot be empty": "Tên hiển thị không thể trống",
-    "New password cannot contain blank space.": "Mật khẩu mới không thể chứa dấu trắng.",
-    "New password must have at least 6 characters": "Mật khẩu mới phải có ít nhất 6 ký tự"
+    "New password cannot contain blank space.": "Mật khẩu mới không thể chứa dấu trắng."
   },
   "user_upload": {
     "Failed to import users": "Không thể nhập người dùng"
diff --git a/i18n/locales/zh/data.json b/i18n/locales/zh/data.json
index ef3d6bfd..48ba187d 100644
--- a/i18n/locales/zh/data.json
+++ b/i18n/locales/zh/data.json
@@ -120,8 +120,7 @@
   },
   "user": {
     "Display name cannot be empty": "显示名称不可为空",
-    "New password cannot contain blank space.": "新密码不可以包含空格",
-    "New password must have at least 6 characters": "新密码至少需要6位字符"
+    "New password cannot contain blank space.": "新密码不可以包含空格"
   },
   "user_upload": {
     "Failed to import users": "导入用户失败"