diff --git a/i18n/en-US.json b/i18n/en-US.json
index bd9ce38..ae3661d 100644
--- a/i18n/en-US.json
+++ b/i18n/en-US.json
@@ -387,7 +387,7 @@
 		"dialogChangePassword": {
 			"help": "You can set a new password by just typing any password you want, along with the Email address!",
 			"password": "Password",
-			"passwordPlaceholder": "Password (Min. 8 characters)",
+			"passwordPlaceholder": "Password (Min. 6 characters)",
 			"title": "Update Email and password",
 			"username": "User's Email address"
 		},
@@ -406,7 +406,7 @@
 			"lastName": "Last Name",
 			"loginEmail": "Email used for Login",
 			"notificationEmail": "Notification E-mail",
-			"password": "Password (Min. 8 characters)",
+			"password": "Password (Min. 6 characters)",
 			"sendToDifferentEmail": "Send emails to an alternate address",
 			"title": "Create User",
 			"vmboxAlreadyExist": "VMBox Number is already taken, please choose a different Voicemail Box Number.",
diff --git a/i18n/fr-FR.json b/i18n/fr-FR.json
index 63d5650..ad911aa 100644
--- a/i18n/fr-FR.json
+++ b/i18n/fr-FR.json
@@ -357,7 +357,7 @@
 		"dialogChangePassword": {
 			"help": "Vous pouvez mettre à jour votre mot de passe en tapant votre Email et le nouveau mot de passe ci-dessus!",
 			"password": "Mot de passe",
-			"passwordPlaceholder": "(Min. 8 caractères)",
+			"passwordPlaceholder": "(Min. 6 caractères)",
 			"title": "Mettre à jour Email / Mot de passe",
 			"username": "Email de l'utilisateur"
 		},
@@ -376,7 +376,7 @@
 			"lastName": "Nom",
 			"loginEmail": "Email/Login de l'utilisateur",
 			"notificationEmail": "Email pour notifications",
-			"password": "(Min. 8 caractères)",
+			"password": "(Min. 6 caractères)",
 			"sendToDifferentEmail": "Envoyer les emails à une autre adresse",
 			"title": "Créer Utilisateur",
 			"vmboxAlreadyExist": "Le numéro de répondeur existe déjà, veuillez en choisir un autre.",
diff --git a/i18n/ru-RU.json b/i18n/ru-RU.json
index 0496d85..7fd04df 100644
--- a/i18n/ru-RU.json
+++ b/i18n/ru-RU.json
@@ -376,7 +376,7 @@
 		"dialogChangePassword": {
 			"help": "Вы можете установить новый пароль введя любой пароль, а так же и новый адрес электронной почты!",
 			"password": "Пароль",
-			"passwordPlaceholder": "Пароль (Мин. 8 знаков)",
+			"passwordPlaceholder": "Пароль (Мин. 6 знаков)",
 			"title": "Изменение Email и паролья",
 			"username": "Email пользователя"
 		},
@@ -395,7 +395,7 @@
 			"lastName": "Фамилия",
 			"loginEmail": "Email пользователя для входа в систему",
 			"notificationEmail": "E-mail для отпавки уведомлений",
-			"password": "Пароль (Мин. 8 знаков)",
+			"password": "Пароль (Мин. 6 знаков)",
 			"sendToDifferentEmail": "Отправлять сообщения на альтернативный Email",
 			"title": "Создание пользователя",
 			"vmboxAlreadyExist": "Голосовой ящик уже выбран, пожалуйта выберите номер другого голосового почтового ящика.",
diff --git a/submodules/users/users.css b/submodules/users/users.css
index 210448f..3a20922 100644
--- a/submodules/users/users.css
+++ b/submodules/users/users.css
@@ -597,7 +597,11 @@
 }
 
 #creation_user_dialog label.monster-invalid[for="extension"] {
-	margin-left: 156px;
+	margin-left: 160px;
+}
+
+#creation_user_dialog label.monster-invalid[for="password"] {
+	margin-top: 25px;
 }
 
 #creation_user_dialog .control-group.hack-left .control-label{
@@ -647,6 +651,11 @@
 	width: 153px;
 }
 
+/* Change Password Popup */
+.change-password-popup label.monster-invalid[for="inputPassword"] {
+	margin-top: 25px;
+}
+
 /* Caller-ID User Feature Popup */
 .feature-popup-container[data-feature="caller_id"] {
 	width: 525px;
diff --git a/submodules/users/users.js b/submodules/users/users.js
index db6019a..a6339fb 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -588,6 +588,9 @@ define(function(require){
 								},
 								'vmbox.number': {
 									checkList: originalData.listVMBoxes
+								},
+								'user.password': {
+									minlength: 6
 								}
 							},
 							messages: {
@@ -860,6 +863,14 @@ define(function(require){
 
 				monster.ui.showPasswordStrength(passwordTemplate.find('#inputPassword'));
 
+				monster.ui.validate(form, {
+					rules: {
+						'password': {
+							minlength: 6
+						}
+					}
+				});
+
 				passwordTemplate.find('.save-new-username').on('click', function() {
 					var formData = monster.ui.getFormData('form_new_username'),
 						userToSave = $.extend(true, {}, currentUser, formData);
diff --git a/views/users-changePassword.html b/views/users-changePassword.html
index f261dc5..d7d01c1 100644
--- a/views/users-changePassword.html
+++ b/views/users-changePassword.html
@@ -10,7 +10,7 @@
 			<div class="control-group">
 				<label class="control-label" for="inputPassword">{{ i18n.users.dialogChangePassword.password }}</label>
 				<div class="controls">
-					<input name="password" type="password" id="inputPassword" placeholder="{{ i18n.users.dialogChangePassword.passwordPlaceholder }}">
+					<input required name="password" type="password" id="inputPassword" placeholder="{{ i18n.users.dialogChangePassword.passwordPlaceholder }}">
 				</div>
 			</div>
 		</form>
diff --git a/views/users-creation.html b/views/users-creation.html
index a0ec6e7..0ccf159 100644
--- a/views/users-creation.html
+++ b/views/users-creation.html
@@ -19,7 +19,7 @@
 		<div class="control-group">
 			<label class="control-label" for="password"><i class="fa fa-unlock"></i></label>
 			<div class="controls">
-				<input type="password" name="user.password" id="password" placeholder="{{i18n.users.dialogCreationUser.password}}"/>
+				<input required type="password" name="user.password" id="password" placeholder="{{i18n.users.dialogCreationUser.password}}"/>
 			</div>
 		</div>
 	</div>