diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php
index b09fa6121..c128ed427 100644
--- a/op/op.UsrMgr.php
+++ b/op/op.UsrMgr.php
@@ -358,10 +358,7 @@ else if ($action == "edituser") {
 
 	$login   = $_POST["login"];
 	$pwd     = $_POST["pwd"];
-	if(isset($_POST['clearpwd']) && $_POST['clearpwd'])
-		$clearpwd = 1;
-	else
-		$clearpwd = 0;
+	$clearpwd = (isset($_POST['clearpwd']) && $_POST['clearpwd']) ? true : false;
 	if(isset($_POST["pwdexpiration"]))
 		$pwdexpiration = $_POST["pwdexpiration"];
 	else
diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index 7846775d0..ff754ecbd 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -290,9 +290,30 @@ $(document).ready( function() {
 				'value'=>($currUser ? htmlspecialchars($currUser->getLogin()) : '')
 			)
 		);
+		if ($currUser && $currUser->isGuest()) {
+			$this->formField(
+				getMLText("clear_password"),
+				array(
+					'element'=>'input',
+					'type'=>'checkbox',
+					'name'=>'clearpwd',
+					'value'=>1,
+				)
+			);
+		}
 		$this->formField(
 			getMLText("password"),
-			'<input type="password" class="pwd form-control" rel="strengthbar'.($currUser ? $currUser->getID() : "0").'" name="pwd" id="pwd">'.(($currUser && $currUser->isGuest()) ? ' <input type="checkbox" name="clearpwd" value="1" /> '.getMLText('clear_password') : '')
+			array(
+				'element'=>'input',
+				'type'=>'password',
+				'id'=>'pwd',
+				'name'=>'pwd',
+				'class'=>'pwd',
+				'autocomplete'=>'off',
+				'required'=>true,
+				'attributes'=>[['rel', 'strengthbar'.($currUser ? $currUser->getID() : "0")]],
+				'addon'=>'<i class="fa fa-eye-slash"></i>'
+			)
 		);
 		if($passwordstrength > 0) {
 			$this->formField(
@@ -307,6 +328,8 @@ $(document).ready( function() {
 				'type'=>'password',
 				'id'=>'pwdconf',
 				'name'=>'pwdconf',
+				'autocomplete'=>'off',
+				'addon'=>'<i class="fa fa-eye-slash"></i>'
 			)
 		);
 		if($passwordexpiration > 0 && (!$currUser || !$currUser->isAdmin())) {
@@ -673,4 +696,3 @@ $(document).ready( function() {
 		$this->htmlEndPage();
 	} /* }}} */
 }
-?>