diff --git a/settings/css/settings.css b/settings/css/settings.css
index 1280f5237a..5e97f1bb66 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -12,6 +12,10 @@ input#openid, input#webdav {
 
 /* PERSONAL */
 
+.clear {
+	clear: both;
+}
+
 /* icons for sidebar */
 .nav-icon-personal-settings {
 	background-image: url('../img/personal.svg?v=1');
@@ -226,8 +230,7 @@ input#openid, input#webdav {
 }
 
 #lostpassword,
-#groups,
-#passwordform {
+#groups {
 	display: inline-block;
 	margin-bottom: 0;
 	padding-bottom: 0;
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 5dc6abf2b3..7a301e5e63 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -239,6 +239,8 @@
 </div>
 </div>
 
+<div class="clear"></div>
+
 <?php if ($_['showGroupMembership'] === true): ?>
 <div id="groups" class="section">
 	<h2><?php p($l->t('Groups')); ?></h2>
@@ -353,7 +355,7 @@ if($_['passwordChangeSupported']) {
 
 	<h3><?php p($l->t('App passwords'));?></h3>
 	<p class="settings-hint"><?php p($l->t('Here you can generate individual passwords for apps so you don’t have to give out your password. You can revoke them individually too.'));?></p>
-	
+
 	<div id="app-password-form">
 		<input id="app-password-name" type="text" placeholder="<?php p($l->t('App name')); ?>">
 		<button id="add-app-password" class="button"><?php p($l->t('Create new app password')); ?></button>