3 files changed, 37 insertions, 25 deletions
diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css
index 3d78124fe..0532268f1 100644
--- a/view/css/mod_settings.css
+++ b/view/css/mod_settings.css
@@ -3,6 +3,13 @@
 }
 #settings-permissions-wrapper .field label{
 	width: 350px;
-	font-weight: bold;
 }
 
+.settings-submit-wrapper {
+	margin-bottom: 10px;
+}
+
+#settings-remove-account-link {
+	margin-top: 15px;
+	margin-bottom: 45px;
+}
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index a759e356a..48b3cffe7 100644
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -5,21 +5,9 @@ $nickname_block
 <form action="settings" id="settings-form" method="post" autocomplete="off" >
 <input type='hidden' name='form_security_token' value='$form_security_token'>
 
-<h3 class="settings-heading">$h_pass</h3>
-
-{{inc field_password.tpl with $field=$password1 }}{{endinc}}
-{{inc field_password.tpl with $field=$password2 }}{{endinc}}
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
 <h3 class="settings-heading">$h_basic</h3>
 
 {{inc field_input.tpl with $field=$username }}{{endinc}}
-{{inc field_input.tpl with $field=$email }}{{endinc}}
 {{inc field_custom.tpl with $field=$timezone }}{{endinc}}
 {{inc field_input.tpl with $field=$defloc }}{{endinc}}
 {{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
@@ -50,25 +38,14 @@ $nickname_block
 
 
 
-
-{{inc field_input.tpl with $field=$maxreq }}{{endinc}}
-
 $profile_in_dir
 
-$profile_in_net_dir
-
-$hide_friends
-
-$hide_wall
-
-$blockwall
-
 $blocktags
 
 $suggestme
 
-$unkmail
 
+{{inc field_input.tpl with $field=$maxreq }}{{endinc}}
 
 {{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
 
diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl
new file mode 100644
index 000000000..d1a635f91
--- /dev/null
+++ b/view/tpl/settings_account.tpl
@@ -0,0 +1,28 @@
+<h1>$title</h1>
+
+
+<div id="settings-remove-account-link">
+<a href="removeme" title="$permanent" >$removeme</a>
+</div>
+
+
+<form action="settings/account" id="settings-account-form" method="post" autocomplete="off" >
+<input type='hidden' name='form_security_token' value='$form_security_token'>
+
+{{inc field_input.tpl with $field=$email }}{{endinc}}
+
+
+<h3 class="settings-heading">$h_pass</h3>
+
+{{inc field_password.tpl with $field=$password1 }}{{endinc}}
+{{inc field_password.tpl with $field=$password2 }}{{endinc}}
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+$account_settings
+
+
+