diff --git a/core/css/inputs.scss b/core/css/inputs.scss
index 37405172d3..13a164e13f 100644
--- a/core/css/inputs.scss
+++ b/core/css/inputs.scss
@@ -1,12 +1,12 @@
 /**
  * @copyright Copyright (c) 2016, John Molakvoæ <skjnldsv@protonmail.com>
  * @copyright Copyright (c) 2016, Morris Jobke <hey@morrisjobke.de>
- * @copyright Copyright (c) 2016, Jan-Christoph Borchardt <hey@jancborchardt.net>
  * @copyright Copyright (c) 2016, Joas Schilling <coding@schilljs.com>
  * @copyright Copyright (c) 2016, Julius Haertl <jus@bitgrid.net>
  * @copyright Copyright (c) 2016, jowi <sjw@gmx.ch>
  * @copyright Copyright (c) 2015, Joas Schilling <nickvergessen@owncloud.com>
  * @copyright Copyright (c) 2015, Hendrik Leppelsack <hendrik@leppelsack.de>
+ * @copyright Copyright (c) 2014-2017, Jan-Christoph Borchardt <hey@jancborchardt.net>
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -301,6 +301,21 @@ input {
 		}
 	}
 }
+#app-settings-content {
+	input {
+		&[type='checkbox'],
+		&[type='radio'] {
+			&.radio,
+			&.checkbox {
+				+ label {
+					display: inline-block;
+					width: 100%;
+					padding: 5px 0;
+				}
+			}
+		}
+	}
+}
 
 /* Select2 overriding. Merged to core with vendor stylesheet */
 .select2-drop {
diff --git a/settings/templates/users/main.php b/settings/templates/users/main.php
index 4fd8572029..3688f2296c 100644
--- a/settings/templates/users/main.php
+++ b/settings/templates/users/main.php
@@ -51,13 +51,6 @@ translation('settings');
 						<?php p($l->t('Show storage location')) ?>
 					</label>
 				</p>
-				<p>
-					<input type="checkbox" name="LastLogin" value="LastLogin" id="CheckboxLastLogin"
-						class="checkbox" <?php if ($_['show_last_login'] === 'true') print_unescaped('checked="checked"'); ?> />
-					<label for="CheckboxLastLogin">
-						<?php p($l->t('Show last log in')) ?>
-					</label>
-				</p>
 				<p>
 					<input type="checkbox" name="UserBackend" value="UserBackend" id="CheckboxUserBackend"
 						class="checkbox" <?php if ($_['show_backend'] === 'true') print_unescaped('checked="checked"'); ?> />
@@ -65,6 +58,20 @@ translation('settings');
 						<?php p($l->t('Show user backend')) ?>
 					</label>
 				</p>
+				<p>
+					<input type="checkbox" name="LastLogin" value="LastLogin" id="CheckboxLastLogin"
+						class="checkbox" <?php if ($_['show_last_login'] === 'true') print_unescaped('checked="checked"'); ?> />
+					<label for="CheckboxLastLogin">
+						<?php p($l->t('Show last login')) ?>
+					</label>
+				</p>
+				<p>
+					<input type="checkbox" name="EmailAddress" value="EmailAddress" id="CheckboxEmailAddress"
+						class="checkbox" <?php if ($_['show_email'] === 'true') print_unescaped('checked="checked"'); ?> />
+					<label for="CheckboxEmailAddress">
+						<?php p($l->t('Show email address')) ?>
+					</label>
+				</p>
 				<p>
 					<input type="checkbox" name="MailOnUserCreate" value="MailOnUserCreate" id="CheckboxMailOnUserCreate"
 						class="checkbox" <?php if ($_['send_email'] === 'true') print_unescaped('checked="checked"'); ?> />
@@ -73,14 +80,7 @@ translation('settings');
 					</label>
 				</p>
 				<p class="info-text">
-					<?php p($l->t('When the password of the new user is left empty an activation email with a link to set the password is send to the user')) ?>
-				</p>
-				<p>
-					<input type="checkbox" name="EmailAddress" value="EmailAddress" id="CheckboxEmailAddress"
-						class="checkbox" <?php if ($_['show_email'] === 'true') print_unescaped('checked="checked"'); ?> />
-					<label for="CheckboxEmailAddress">
-						<?php p($l->t('Show email address')) ?>
-					</label>
+					<?php p($l->t('When the password of a new user is left empty, an activation email with a link to set the password is sent.')) ?>
 				</p>
 			</div>
 		</div>