diff --git a/templates/account/edit.tpl b/templates/account/edit.tpl
index a33a118..ad3734e 100644
--- a/templates/account/edit.tpl
+++ b/templates/account/edit.tpl
@@ -1,117 +1,118 @@
 <div class="account">
 	<!-- IMPORT partials/account/header.tpl -->
-	
-	<div class="row">
-		<div class="col-md-2 col-sm-4">
-			<div class="account-picture-block text-center">
-				<div class="row">
-					<div class="col-xs-12">
-						<!-- IF picture -->
-						<img id="user-current-picture" class="user-profile-picture" src="{picture}" />
-						<!-- ELSE -->
-						<div class="user-icon user-profile-picture" style="background-color: {icon:bgColor};">{icon:text}</div>
-						<!-- ENDIF picture -->
+	<!-- IF sso.length --><div><!-- ENDIF sso.length -->
+		<div class="row">
+			<div class="col-md-3 col-sm-4">
+				<div class="account-picture-block text-center">
+					<div class="row">
+						<div class="col-xs-12">
+							<!-- IF picture -->
+							<img id="user-current-picture" class="user-profile-picture" src="{picture}" />
+							<!-- ELSE -->
+							<div class="user-icon user-profile-picture" style="background-color: {icon:bgColor};">{icon:text}</div>
+							<!-- ENDIF picture -->
+						</div>
 					</div>
-				</div>
-				<ul class="list-group">
-					<a id="changePictureBtn" href="#" class="list-group-item">[[user:change_picture]]</a>
-					<!-- IF !username:disableEdit -->
-					<a href="{config.relative_path}/user/{userslug}/edit/username" class="list-group-item">[[user:change_username]]</a>
-					<!-- ENDIF !username:disableEdit -->
-					<a href="{config.relative_path}/user/{userslug}/edit/email" class="list-group-item">[[user:change_email]]</a>
-					<a href="{config.relative_path}/user/{userslug}/edit/password" class="list-group-item">[[user:change_password]]</a>
-				</ul>
+					<ul class="list-group">
+						<a id="changePictureBtn" href="#" class="list-group-item">[[user:change_picture]]</a>
+						<!-- IF !username:disableEdit -->
+						<a href="{config.relative_path}/user/{userslug}/edit/username" class="list-group-item">[[user:change_username]]</a>
+						<!-- ENDIF !username:disableEdit -->
+						<a href="{config.relative_path}/user/{userslug}/edit/email" class="list-group-item">[[user:change_email]]</a>
+						<a href="{config.relative_path}/user/{userslug}/edit/password" class="list-group-item">[[user:change_password]]</a>
+					</ul>
 
-				<!-- IF config.requireEmailConfirmation -->
-				<!-- IF email -->
-				<!-- IF isSelf -->
-				<a id="confirm-email" href="#" class="btn btn-warning <!-- IF email:confirmed -->hide<!-- ENDIF email:confirmed -->">[[user:confirm_email]]</a><br/><br/>
-				<!-- ENDIF isSelf -->
-				<!-- ENDIF email -->
-				<!-- ENDIF config.requireEmailConfirmation -->
+					<!-- IF config.requireEmailConfirmation -->
+					<!-- IF email -->
+					<!-- IF isSelf -->
+					<a id="confirm-email" href="#" class="btn btn-warning <!-- IF email:confirmed -->hide<!-- ENDIF email:confirmed -->">[[user:confirm_email]]</a><br/><br/>
+					<!-- ENDIF isSelf -->
+					<!-- ENDIF email -->
+					<!-- ENDIF config.requireEmailConfirmation -->
 
-				<!-- IF config.allowAccountDelete -->
-				<!-- IF isSelf -->
-				<a id="deleteAccountBtn" href="#" class="btn btn-danger">[[user:delete_account]]</a><br/><br/>
-				<!-- ENDIF isSelf -->
-				<!-- ENDIF config.allowAccountDelete -->
+					<!-- IF config.allowAccountDelete -->
+					<!-- IF isSelf -->
+					<a id="deleteAccountBtn" href="#" class="btn btn-danger">[[user:delete_account]]</a><br/><br/>
+					<!-- ENDIF isSelf -->
+					<!-- ENDIF config.allowAccountDelete -->
 
+				</div>
 			</div>
-		</div>
 
-		<div class="col-md-5 col-sm-4">
-			<div>
-				<form class='form-horizontal'>
+			<div class="<!-- IF !sso.length -->col-md-9 col-sm-8<!-- ELSE -->col-md-5 col-sm-4<!-- ENDIF !sso.length -->">
+				<div>
+					<form class='form-horizontal'>
 
-					<div class="control-group">
-						<label class="control-label" for="inputFullname">[[user:fullname]]</label>
-						<div class="controls">
-							<input class="form-control" type="text" id="inputFullname" placeholder="[[user:fullname]]" value="{fullname}">
+						<div class="control-group">
+							<label class="control-label" for="inputFullname">[[user:fullname]]</label>
+							<div class="controls">
+								<input class="form-control" type="text" id="inputFullname" placeholder="[[user:fullname]]" value="{fullname}">
+							</div>
 						</div>
-					</div>
 
-					<div class="control-group">
-						<label class="control-label" for="inputWebsite">[[user:website]]</label>
-						<div class="controls">
-							<input class="form-control" type="text" id="inputWebsite" placeholder="http://..." value="{website}">
+						<div class="control-group">
+							<label class="control-label" for="inputWebsite">[[user:website]]</label>
+							<div class="controls">
+								<input class="form-control" type="text" id="inputWebsite" placeholder="http://..." value="{website}">
+							</div>
 						</div>
-					</div>
 
-					<div class="control-group">
-						<label class="control-label" for="inputLocation">[[user:location]]</label>
-						<div class="controls">
-							<input class="form-control" type="text" id="inputLocation" placeholder="[[user:location]]" value="{location}">
+						<div class="control-group">
+							<label class="control-label" for="inputLocation">[[user:location]]</label>
+							<div class="controls">
+								<input class="form-control" type="text" id="inputLocation" placeholder="[[user:location]]" value="{location}">
+							</div>
 						</div>
-					</div>
 
-					<div class="control-group">
-						<label class="control-label" for="inputBirthday">[[user:birthday]]</label>
-						<div class="controls">
-							<input class="form-control" id="inputBirthday" value="{birthday}" placeholder="mm/dd/yyyy">
+						<div class="control-group">
+							<label class="control-label" for="inputBirthday">[[user:birthday]]</label>
+							<div class="controls">
+								<input class="form-control" id="inputBirthday" value="{birthday}" placeholder="mm/dd/yyyy">
+							</div>
 						</div>
-					</div>
 
-					<div class="control-group">
-						<label class="control-label" for="inputAboutMe">[[user:aboutme]]</label> <small><label id="aboutMeCharCountLeft"></label></small>
-						<div class="controls">
-							<textarea class="form-control" id="inputAboutMe" rows="5">{aboutme}</textarea>
+						<div class="control-group">
+							<label class="control-label" for="inputAboutMe">[[user:aboutme]]</label> <small><label id="aboutMeCharCountLeft"></label></small>
+							<div class="controls">
+								<textarea class="form-control" id="inputAboutMe" rows="5">{aboutme}</textarea>
+							</div>
 						</div>
-					</div>
-					<!-- IF !disableSignatures -->
-					<div class="control-group">
-						<label class="control-label" for="inputSignature">[[user:signature]]</label> <small><label id="signatureCharCountLeft"></label></small>
-						<div class="controls">
-							<textarea class="form-control" id="inputSignature" rows="5">{signature}</textarea>
+						<!-- IF !disableSignatures -->
+						<div class="control-group">
+							<label class="control-label" for="inputSignature">[[user:signature]]</label> <small><label id="signatureCharCountLeft"></label></small>
+							<div class="controls">
+								<textarea class="form-control" id="inputSignature" rows="5">{signature}</textarea>
+							</div>
 						</div>
-					</div>
-					<!-- ENDIF !disableSignatures -->
+						<!-- ENDIF !disableSignatures -->
 
-					<input type="hidden" id="inputUID" value="{uid}"><br />
+						<input type="hidden" id="inputUID" value="{uid}"><br />
 
-					<div class="form-actions">
-						<a id="submitBtn" href="#" class="btn btn-primary">[[global:save_changes]]</a>
-					</div>
+						<div class="form-actions">
+							<a id="submitBtn" href="#" class="btn btn-primary">[[global:save_changes]]</a>
+						</div>
 
-				</form>
-			</div>
+					</form>
+				</div>
 
-			<hr class="visible-xs visible-sm"/>
-		</div>
+				<hr class="visible-xs visible-sm"/>
+			</div>
 
-		<div class="col-md-5 col-sm-4">
 			<!-- IF sso.length -->
-			<label class="control-label">[[user:sso.title]]</label>
-			<div class="list-group">
-				<!-- BEGIN sso -->
-				<a class="list-group-item" href="{../url}" target="<!-- IF ../associated -->_blank<!-- ELSE -->_top<!-- ENDIF ../associated -->">
-					<!-- IF ../icon --><i class="fa {../icon}"></i><!-- ENDIF ../icon -->
-					<!-- IF ../associated -->[[user:sso.associated]]<!-- ELSE -->[[user:sso.not-associated]]<!-- ENDIF ../associated -->
-					{../name}
-				</a>
-				<!-- END sso -->
+			<div class="col-md-5 col-sm-4">
+				<label class="control-label">[[user:sso.title]]</label>
+				<div class="list-group">
+					<!-- BEGIN sso -->
+					<a class="list-group-item" href="{../url}" target="<!-- IF ../associated -->_blank<!-- ELSE -->_top<!-- ENDIF ../associated -->">
+						<!-- IF ../icon --><i class="fa {../icon}"></i><!-- ENDIF ../icon -->
+						<!-- IF ../associated -->[[user:sso.associated]]<!-- ELSE -->[[user:sso.not-associated]]<!-- ENDIF ../associated -->
+						{../name}
+					</a>
+					<!-- END sso -->
+				</div>
 			</div>
 			<!-- ENDIF sso.length -->
 		</div>
-	</div>
+	<!-- IF sso.length --></div><!-- ENDIF sso.length -->
 </div>