diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/UserManager/modal/CreateUserController.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/UserManager/modal/CreateUserController.js
index 5aec731a6c6a706f3ea7d7380059e8a6939b228d..c493b4a99297da18ca38fbca344b30f13e0bf365 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/UserManager/modal/CreateUserController.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/UserManager/modal/CreateUserController.js
@@ -42,16 +42,20 @@ function CreateUserController() {
 			if(!this._createUserModel.isPasswordRequired) {
 				createUser();
 			} else {
-				mainController.serverFacade.registerUserPassword(
-						_this._createUserModel.userId,
-						_this._createUserModel.password,
-						function(isRegistered) {
-							if(isRegistered) {
-								createUser();
-							} else {
-								Util.showError("User can't be created, check with your administator.");
-							}
-						});
+				if(_this._createUserModel.password === _this._createUserModel.passwordRepeat) {
+					mainController.serverFacade.registerUserPassword(
+							_this._createUserModel.userId,
+							_this._createUserModel.password,
+							function(isRegistered) {
+								if(isRegistered) {
+									createUser();
+								} else {
+									Util.showError("User can't be created, check with your administator.");
+								}
+							});
+				} else {
+					Util.showError("Passwords are not equal.", function() {});
+				}
 			}
 		
 	}
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/UserManager/modal/CreateUserModel.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/UserManager/modal/CreateUserModel.js
index 81157393f9e3c1104f478a95538dfa39f97e2cef..ed1b1f553ce5c74490f34eae46bcabe99368902d 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/UserManager/modal/CreateUserModel.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/UserManager/modal/CreateUserModel.js
@@ -18,4 +18,5 @@ function CreateUserModel() {
 	this.isPasswordRequired = false;
 	this.userId = null;
 	this.password = null;
+	this.passwordRepeat = null;
 }
\ No newline at end of file
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/UserManager/modal/CreateUserView.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/UserManager/modal/CreateUserView.js
index 88bfaac17bedcbde780ee5f40b6ed9d392d11bbb..d432e82cf5b08e34b7f30c5eeef36d8dbc095c90 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/UserManager/modal/CreateUserView.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/UserManager/modal/CreateUserView.js
@@ -20,10 +20,14 @@ function CreateUserView(createUserController, createUserModel) {
 	this._warning = null;
 	this._passField = null;
 	this._passwordGroup = null;
+	this._passFieldRepeat = null;
+	this._passwordGroupRepeat = null;
 	
 	this.showPasswordField = function() {
 		this._passField.removeAttr('disabled');
 		this._passwordGroup.show();
+		this._passFieldRepeat.removeAttr('disabled');
+		this._passwordGroupRepeat.show();
 		this._warning.show();
 	}
 	
@@ -61,7 +65,7 @@ function CreateUserView(createUserController, createUserModel) {
 		//
 		// Password
 		//
-		var $passField = FormUtil._getInputField('text', null, 'Password', null, true);
+		var $passField = FormUtil._getInputField('password', null, 'Password', null, true);
 		$passField.change(function(event) {
 			_this._createUserModel.password = $(this).val();
 		});
@@ -72,6 +76,20 @@ function CreateUserView(createUserController, createUserModel) {
 		this._passField = $passField;
 		this._passwordGroup = $passwordGroup;
 		
+		//
+		// Password Repeat
+		//
+		var $passFieldRepeat = FormUtil._getInputField('password', null, 'Repeat the same password', null, true);
+		$passFieldRepeat.change(function(event) {
+			_this._createUserModel.passwordRepeat = $(this).val();
+		});
+		$passFieldRepeat.prop('disabled', true);
+		var $passwordGroupRepeat = FormUtil.getFieldForComponentWithLabel($passFieldRepeat, "Password Repeat", null);
+		$passwordGroupRepeat.hide();
+		$window.append($passwordGroupRepeat);
+		this._passFieldRepeat = $passFieldRepeat;
+		this._passwordGroupRepeat = $passwordGroupRepeat;
+		
 		//
 		// Buttons
 		//