diff --git a/views/bootstrap/class.EditUserData.php b/views/bootstrap/class.EditUserData.php
index 2fd2e47d6..cc605ed43 100644
--- a/views/bootstrap/class.EditUserData.php
+++ b/views/bootstrap/class.EditUserData.php
@@ -100,14 +100,26 @@ $(document).ready( function() {
 				'id'=>'currentpwd',
 				'name'=>'currentpwd',
 				'autocomplete'=>'off',
-				'required'=>true
+				'required'=>true,
+				'addon'=>'<i class="fa fa-eye-slash"></i>'
 			)
 		);
 		if(!$disablechangepassword) {
 		$this->formField(
 			getMLText("new_password"),
-			'<input class="form-control pwd" type="password" rel="strengthbar" id="pwd" name="pwd" size="30">'
+			array(
+				'element'=>'input',
+				'type'=>'password',
+				'id'=>'pwd',
+				'name'=>'pwd',
+				'class'=>'pwd',
+				'autocomplete'=>'off',
+				'required'=>true,
+				'attributes'=>[['rel', 'strengthbar']],
+				'addon'=>'<i class="fa fa-eye-slash"></i>'
+			)
 		);
+
 		if($passwordstrength) {
 			$this->formField(
 				getMLText("password_strength"),
@@ -122,6 +134,7 @@ $(document).ready( function() {
 				'id'=>'pwdconf',
 				'name'=>'pwdconf',
 				'autocomplete'=>'off',
+				'addon'=>'<i class="fa fa-eye-slash"></i>'
 			)
 		);
 		}