diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index 443ffe85aa..9cd38379b8 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -1113,6 +1113,7 @@ require_once "resources/require.php";
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
 
 //show the footer
diff --git a/app/devices/device_profile_edit.php b/app/devices/device_profile_edit.php
index b3092a04e7..17f4da1f20 100644
--- a/app/devices/device_profile_edit.php
+++ b/app/devices/device_profile_edit.php
@@ -603,6 +603,7 @@ require_once "resources/require.php";
 	echo "	</td>\n";
 	echo "</tr>";
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
 
 //show the footer
diff --git a/app/xmpp/profile_edit.php b/app/xmpp/profile_edit.php
index 6cbff12c84..df4350e6e2 100644
--- a/app/xmpp/profile_edit.php
+++ b/app/xmpp/profile_edit.php
@@ -268,7 +268,7 @@ function show_advanced_config() {
 	<tr>
 		<td colspan='2' align='right'>
 			<input type='hidden' name='profile_id' value='<?php echo $profile['xmpp_profile_uuid']; ?>'>
-			<br><br>
+			<br>
 			<input type='submit' name='submit' class='btn' value='<?php echo $text['button-save']?>'>
 		</td>
 	</tr>
diff --git a/core/users/signup.php b/core/users/signup.php
index 99af4f9377..a39a23cb51 100644
--- a/core/users/signup.php
+++ b/core/users/signup.php
@@ -247,6 +247,7 @@ if (count($_POST)>0 && check_str($_POST["persistform"]) != "1") {
 	echo "			<b>".$text['header-user_add']."</b>\n";
 	echo "			<br><br>\n";
 	echo "			".$text['description-user_add']."\n";
+	echo "			<br><br>\n";
 	echo "		</td>\n";
 	echo "		<td width='20%' valign='top' align='right'>\n";
 	echo "			<input type='button' class='btn' name='back' alt='".$text['button-back']."' onclick=\"document.location.href='index.php';\" value='".$text['button-back']."'>\n";
diff --git a/core/users/usersupdate.php b/core/users/usersupdate.php
index 8a5787d21b..e6b911f476 100644
--- a/core/users/usersupdate.php
+++ b/core/users/usersupdate.php
@@ -712,7 +712,7 @@ else {
 	echo "</tr>\n";
 
 	echo "	<tr>";
-	echo "		<td colspan='2' align='right'><br>";
+	echo "		<td colspan='2' align='right'>";
 	echo "			<input type='hidden' name='id' value=\"$user_uuid\">";
 	echo "			<input type='hidden' name='username_old' value=\"$username\">";
 	echo "			<br>";