diff --git a/less/account.less b/less/account.less
index 7dcffbc..932bfba 100644
--- a/less/account.less
+++ b/less/account.less
@@ -3,6 +3,13 @@
 		margin-bottom: 30px;
 	}
 
+	.edit-form {
+		max-width: 300px;
+		margin-left: auto;
+		margin-right: auto;
+		margin-bottom: 50px;
+	}
+
 	> .row {
 		max-width: @screen-sm-min;
 		margin-left: auto;
diff --git a/templates/account/edit/email.tpl b/templates/account/edit/email.tpl
index fe88a28..ee8c798 100644
--- a/templates/account/edit/email.tpl
+++ b/templates/account/edit/email.tpl
@@ -1,8 +1,7 @@
-<!-- IMPORT partials/account/header.tpl -->
-
-<div class="col-md-5">
-	<form class="form-horizontal">
+<div class="account">
+	<!-- IMPORT partials/account/header.tpl -->
 
+	<form class="form-horizontal edit-form">
 		<div class="control-group">
 			<label class="control-label" for="inputNewEmail">[[user:email]]</label>
 			<div class="controls">
@@ -25,7 +24,7 @@
 
 		<br/>
 		<div class="form-actions">
-			<a id="submitBtn" href="#" class="btn btn-primary"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_email]]</a>
+			<a id="submitBtn" href="#" class="btn btn-primary btn-block"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_email]]</a>
 		</div>
 	</form>
 </div>
diff --git a/templates/account/edit/password.tpl b/templates/account/edit/password.tpl
index 0172d29..f22470c 100644
--- a/templates/account/edit/password.tpl
+++ b/templates/account/edit/password.tpl
@@ -1,7 +1,7 @@
-<!-- IMPORT partials/account/header.tpl -->
+<div class="account">
+	<!-- IMPORT partials/account/header.tpl -->
 
-<div class="col-md-5">
-	<form class='form-horizontal'>
+	<form class="form-horizontal edit-form">
 		<!-- disables autocomplete on FF --><input type="password" style="display:none">
 
 		<!-- IF isSelf -->
@@ -34,7 +34,7 @@
 		</div>
 		<br/>
 		<div class="form-actions">
-			<a id="changePasswordBtn" href="#" class="btn btn-primary"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_password]]</a>
+			<a id="changePasswordBtn" href="#" class="btn btn-primary btn-block"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_password]]</a>
 		</div>
 	</form>
 </div>
\ No newline at end of file
diff --git a/templates/account/edit/username.tpl b/templates/account/edit/username.tpl
index 3ccbd53..28afb48 100644
--- a/templates/account/edit/username.tpl
+++ b/templates/account/edit/username.tpl
@@ -1,8 +1,7 @@
-<!-- IMPORT partials/account/header.tpl -->
-
-<div class="col-md-5">
-	<form class="form-horizontal">
+<div class="account">
+	<!-- IMPORT partials/account/header.tpl -->
 
+	<form class="form-horizontal edit-form">
 		<div class="control-group">
 			<label class="control-label" for="inputNewUsername">[[user:username]]</label>
 			<div class="controls">
@@ -25,7 +24,7 @@
 
 		<br/>
 		<div class="form-actions">
-			<a id="submitBtn" href="#" class="btn btn-primary"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_username]]</a>
+			<a id="submitBtn" href="#" class="btn btn-primary btn-block"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_username]]</a>
 		</div>
 	</form>
 </div>
\ No newline at end of file