diff --git a/views/bootstrap/class.EditUserData.php b/views/bootstrap/class.EditUserData.php
index f84d4cefa..2c79c39d9 100644
--- a/views/bootstrap/class.EditUserData.php
+++ b/views/bootstrap/class.EditUserData.php
@@ -100,11 +100,11 @@ $(document).ready( function() {
 		$this->pageNavigation(getMLText("my_account"), "my_account");
 
 		$this->contentHeading(getMLText("edit_user_details"));
-		$this->contentContainerStart();
 ?>
 <form class="form-horizontal" action="../op/op.EditUserData.php" enctype="multipart/form-data" method="post" id="form">
 	<?php echo createHiddenFieldWithKey('edituserdata'); ?>
 <?php
+		$this->contentContainerStart();
 		$this->formField(
 			getMLText("current_password"),
 			array(
@@ -118,12 +118,12 @@ $(document).ready( function() {
 		);
 		$this->formField(
 			getMLText("new_password"),
-			'<input class="pwd" type="password" rel="strengthbar" id="pwd" name="pwd" size="30">'
+			'<input class="form-control pwd" type="password" rel="strengthbar" id="pwd" name="pwd" size="30">'
 		);
 		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(
@@ -206,12 +206,12 @@ $(document).ready( function() {
 				)
 			);
 		}
+		$this->contentContainerEnd();
 		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */