diff --git a/views/bootstrap/class.ChangePassword.php b/views/bootstrap/class.ChangePassword.php
index 158f8e462..16fb77807 100644
--- a/views/bootstrap/class.ChangePassword.php
+++ b/views/bootstrap/class.ChangePassword.php
@@ -61,17 +61,13 @@ document.form1.newpassword.focus();
 		$this->contentContainerStart();
 		$this->formField(
 			getMLText("password"),
-			'<input class="pwd" type="password" rel="strengthbar" name="newpassword" id="password">'
+			'<input class="pwd form-control" type="password" rel="strengthbar" name="newpassword" id="password">'
 		);
 		if($passwordstrength > 0) {
-?>
-		<div class="control-group">
-			<label class="control-label"><?php printMLText("password_strength");?>:</label>
-			<div class="controls">
-				<div id="strengthbar" class="progress" style="width: 220px; height: 30px; margin-bottom: 8px;"><div class="bar bar-danger" style="width: 0%;"></div></div>
-			</div>
-		</div>
-<?php
+			$this->formField(
+				getMLText("password_strength"),
+				'<div id="strengthbar" class="progress" style="_width: 220px; height: 30px; margin-bottom: 8px;"><div class="bar bar-danger" style="width: 0%;"></div></div>'
+			);
 		}
 		$this->formField(
 			getMLText("confirm_pwd"),
diff --git a/views/bootstrap/class.ForcePasswordChange.php b/views/bootstrap/class.ForcePasswordChange.php
index c1bf33a31..21fa72f76 100644
--- a/views/bootstrap/class.ForcePasswordChange.php
+++ b/views/bootstrap/class.ForcePasswordChange.php
@@ -93,12 +93,12 @@ $(document).ready( function() {
 		);
 		$this->formField(
 			getMLText("new_password"),
-			'<input class="pwd" type="password" rel="strengthbar" id="pwd" name="pwd" size="30">'
+			'<input class="pwd form-control" type="password" rel="strengthbar" id="pwd" name="pwd">'
 		);
 		if($passwordstrength) {
 			$this->formField(
 				getMLText("password_strength"),
-				'<div id="strengthbar" class="progress" style="width: 220px; height: 30px; margin-bottom: 8px;"><div class="bar bar-danger" style="width: 0%;"></div></div>'
+				'<div id="strengthbar" class="progress" style="_width: 220px; height: 30px; margin-bottom: 8px;"><div class="bar bar-danger" style="width: 0%;"></div></div>'
 			);
 		}
 		$this->formField(