diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index cd3093a75ed..16cb5a0c761 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -82,6 +82,21 @@ if($_['displayNameChangeSupported']) {
 			<input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>">
 		</form>
 	</div>
+	<div class="personal-settings-setting-box">
+		<form id="emailform" class="section">
+			<h2>
+				<label for="email"><?php p($l->t('Email')); ?></label>
+				<span class="icon-password"/>
+			</h2>
+			<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
+				   placeholder="<?php p($l->t('Your email address')); ?>"
+				   autocomplete="on" autocapitalize="off" autocorrect="off" />
+			<input type="hidden" id="emailscope" value="<?php p($_['emailScope']) ?>">
+			<br />
+			<em><?php p($l->t('For password recovery and notifications')); ?></em>
+			<span class="icon-checkmark hidden"/>
+		</form>
+	</div>
 	<div class="personal-settings-setting-box">
 		<form id="phoneform" class="section">
 			<h2>
@@ -96,21 +111,6 @@ if($_['displayNameChangeSupported']) {
 			<input type="hidden" id="phonescope" value="<?php p($_['phoneScope']) ?>">
 		</form>
 	</div>
-	<div class="personal-settings-setting-box">
-		<form id="emailform" class="section">
-			<h2>
-				<label for="email"><?php p($l->t('Email')); ?></label>
-				<span class="icon-password"/>
-			</h2>
-			<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
-			       placeholder="<?php p($l->t('Your email address')); ?>"
-			       autocomplete="on" autocapitalize="off" autocorrect="off" />
-			<input type="hidden" id="emailscope" value="<?php p($_['emailScope']) ?>">
-			<br />
-			<em><?php p($l->t('For password recovery and notifications')); ?></em>
-			<span class="icon-checkmark hidden"/>
-		</form>
-	</div>
 	<div class="personal-settings-setting-box">
 		<form id="websiteform" class="section">
 			<h2>