diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html
index 66c9d73be2..976ff88eda 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html
@@ -9,4 +9,4 @@
 <div id="notLongEnough" class="container-fluid text-danger" *ngIf="formGroup.hasError('notLongEnough')">{{FORM_PREFIX + 'error.password-length' | translate}}</div>
 <div id="notSame" class="container-fluid text-danger" *ngIf="formGroup.hasError('notSame')">{{FORM_PREFIX + 'error.matching-passwords' | translate}}</div>
 <div id="emptyPassword" class="container-fluid text-danger" *ngIf="(formGroup.dirty || formGroup.touched) && formGroup.hasError('emptyPassword')">{{FORM_PREFIX + 'error.empty-password' | translate}}</div>
-<div data-test="robust-password-error" class="container-fluid text-danger" *ngIf="isRobustPasswordError">{{FORM_PREFIX + 'error.robust-password' | translate}}</div>
+<div data-test="robust-password-error" class="container-fluid text-danger" *ngIf="isRobustPasswordError">{{'password.error.robust-password' | translate}}</div>
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
index 1eacb9f1be..83548a09d7 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
@@ -129,13 +129,13 @@ export class ProfilePageSecurityFormComponent implements OnInit {
   }
 
   /**
-   * Check if the password is at least 6 characters long
+   * Check if the password is at least 8 characters long
    * @param group The FormGroup to validate
    */
   checkPasswordLength(group: FormGroup) {
     const pass = group.get('password').value;
 
-    return isEmpty(pass) || pass.length >= 6 ? null : {notLongEnough: true};
+    return isEmpty(pass) || pass.length >= 8 ? null : {notLongEnough: true};
   }
 
   /**
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 85f93f06a4..cee1fc5869 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1490,7 +1490,7 @@
 
   "forgot-password.form.head": "Forgot Password",
 
-  "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
+  "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least eight characters long.",
 
   "forgot-password.form.card.security": "Security",
 
@@ -1506,7 +1506,7 @@
 
   "forgot-password.form.error.matching-passwords": "The passwords do not match.",
 
-  "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
+  "forgot-password.form.error.password-length": "The password should be at least 8 characters long.",
 
   "forgot-password.form.notification.error.title": "Error when trying to submit new password",
 
@@ -1516,7 +1516,7 @@
 
   "forgot-password.form.submit": "Submit password",
 
-  "forgot-password.form.error.robust-password": "Selected password is invalid, it should be at least 8 and at most 15 characters long and must contain at least one uppercase and one lowercase character and a number.",
+  "password.error.robust-password": "New password is invalid. Valid passwords must be between 8-15 characters long and must include a minimum of: one uppercase letter, one lowercase letter, one number, and one special character (!?$@#$%^&+=).",
 
 
   "form.add": "Add more",
@@ -3043,9 +3043,9 @@
 
   "profile.security.form.error.matching-passwords": "The passwords do not match.",
 
-  "profile.security.form.error.password-length": "The password should be at least 6 characters long.",
+  "profile.security.form.error.password-length": "The password should be at least 8 characters long.",
 
-  "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
+  "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least eight characters long.",
 
   "profile.security.form.label.password": "Password",
 
@@ -3057,11 +3057,11 @@
 
   "profile.security.form.notifications.error.title": "Error changing passwords",
 
-  "profile.security.form.notifications.error.not-long-enough": "The password has to be at least 6 characters long.",
+  "profile.security.form.notifications.error.not-long-enough": "The password has to be at least 8 characters long.",
 
   "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
 
-  "profile.security.form.error.robust-password": "Selected password is invalid, it should be at least 8 and at most 15 characters long and must contain at least one uppercase and one lowercase character and a number.",
+  "profile.security.form.notifications.error.general": "Please fill required fields of security form.",
 
   "profile.title": "Update Profile",
 
@@ -3145,7 +3145,7 @@
 
   "register-page.create-profile.security.header": "Security",
 
-  "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
+  "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box. It should be at least eight characters long.",
 
   "register-page.create-profile.security.label.password": "Password *",
 
@@ -3153,11 +3153,9 @@
 
   "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
 
-  "register-page.create-profile.security.error.robust-password": "Selected password is invalid, it should be at least 8 and at most 15 characters long and must contain at least one uppercase and one lowercase character and a number.",
-
   "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
 
-  "register-page.create-profile.security.error.password-length": "The password should be at least 6 characters long.",
+  "register-page.create-profile.security.error.password-length": "The password should be at least 8 characters long.",
 
   "register-page.create-profile.submit": "Complete Registration",