diff --git a/app/acl/acl_node_edit.php b/app/acl/acl_node_edit.php
index 0f2d1001eb..d4bfa795b0 100644
--- a/app/acl/acl_node_edit.php
+++ b/app/acl/acl_node_edit.php
@@ -210,7 +210,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if ($action == "update") {
 		echo "		<input type='hidden' name='acl_node_uuid' value='$acl_node_uuid'>\n";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/call_block/call_block_edit.php b/app/call_block/call_block_edit.php
index 9b9731d081..c574e42dc3 100644
--- a/app/call_block/call_block_edit.php
+++ b/app/call_block/call_block_edit.php
@@ -326,7 +326,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if ($action == "update") {
 		echo "		<input type='hidden' name='call_block_uuid' value='$call_block_uuid'>\n";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/call_broadcast/call_broadcast_edit.php b/app/call_broadcast/call_broadcast_edit.php
index 24e4dafc9b..f8276c97b8 100644
--- a/app/call_broadcast/call_broadcast_edit.php
+++ b/app/call_broadcast/call_broadcast_edit.php
@@ -459,7 +459,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/call_center/call_center_tier_edit.php b/app/call_center/call_center_tier_edit.php
index 92933845e7..5f25536092 100644
--- a/app/call_center/call_center_tier_edit.php
+++ b/app/call_center/call_center_tier_edit.php
@@ -382,7 +382,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<tr>\n";
 	echo "	<td colspan='2' align='right'>\n";
 	echo "		<input type='hidden' name='call_center_tier_uuid' value='$call_center_tier_uuid'>\n";
-	echo "		<br><br>";
+	echo "		<br>";
 	echo "		<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "	</td>\n";
 	echo "</tr>";
diff --git a/app/call_flows/call_flow_edit.php b/app/call_flows/call_flow_edit.php
index 9163e2f6ce..d92bbf767d 100644
--- a/app/call_flows/call_flow_edit.php
+++ b/app/call_flows/call_flow_edit.php
@@ -616,7 +616,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "		<input type='hidden' name='call_flow_uuid' value='$call_flow_uuid'>\n";
 		echo "		<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/click_to_call/click_to_call.php b/app/click_to_call/click_to_call.php
index 3b7b3867de..398586aa8f 100644
--- a/app/click_to_call/click_to_call.php
+++ b/app/click_to_call/click_to_call.php
@@ -406,7 +406,7 @@ if (is_array($_REQUEST) && !empty($_REQUEST['src']) && !empty($_REQUEST['dest'])
 
 	echo "<tr>\n";
 	echo "	<td colspan='2' align='right'>\n";
-	echo "		<br><br>";
+	echo "		<br>";
 	echo "		<input type=\"submit\" class='btn' value=\"".$text['button-call']."\">\n";
 	echo "	</td>\n";
 	echo "</tr>\n";
diff --git a/app/destinations/destination_edit.php b/app/destinations/destination_edit.php
index 1931a65e0c..55e8f58ac3 100644
--- a/app/destinations/destination_edit.php
+++ b/app/destinations/destination_edit.php
@@ -792,7 +792,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "		<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
 		echo "		<input type='hidden' name='destination_uuid' value='$destination_uuid'>\n";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/devices/device_key_edit.php b/app/devices/device_key_edit.php
index 82b84db717..5a1a59b759 100644
--- a/app/devices/device_key_edit.php
+++ b/app/devices/device_key_edit.php
@@ -549,7 +549,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if ($action == "update") {
 		echo "		<input type='hidden' name='device_key_uuid' value='$device_key_uuid'>\n";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/devices/device_line_edit.php b/app/devices/device_line_edit.php
index 6737a7ec04..fe8e24bd00 100644
--- a/app/devices/device_line_edit.php
+++ b/app/devices/device_line_edit.php
@@ -341,7 +341,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if ($action == "update") {
 		echo "		<input type='hidden' name='device_line_uuid' value='$device_line_uuid'>\n";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/devices/device_setting_edit.php b/app/devices/device_setting_edit.php
index 74cea51c46..fe80e28f07 100644
--- a/app/devices/device_setting_edit.php
+++ b/app/devices/device_setting_edit.php
@@ -278,7 +278,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if ($action == "update") {
 		echo "		<input type='hidden' name='device_setting_uuid' value='$device_setting_uuid'>\n";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/dialplan/dialplan_detail_edit.php b/app/dialplan/dialplan_detail_edit.php
index 4ed7352ad6..4559054100 100644
--- a/app/dialplan/dialplan_detail_edit.php
+++ b/app/dialplan/dialplan_detail_edit.php
@@ -474,7 +474,7 @@ function replace_param(obj){
 	if ($action == "update") {
 		echo "		<input type='hidden' name='dialplan_detail_uuid' value='$dialplan_detail_uuid'>\n";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/dialplan_inbound/dialplan_inbound_add.php b/app/dialplan_inbound/dialplan_inbound_add.php
index 8e5e0c533e..20512fa6f5 100644
--- a/app/dialplan_inbound/dialplan_inbound_add.php
+++ b/app/dialplan_inbound/dialplan_inbound_add.php
@@ -1094,7 +1094,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if ($action == "update" && permission_exists("inbound_route_edit")) {
 		echo "	<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
 	}
-	echo "		<br><br>";
+	echo "		<br>";
 	echo "		<input type='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "	</td>\n";
 	echo "</tr>";
diff --git a/app/dialplan_outbound/dialplan_outbound_add.php b/app/dialplan_outbound/dialplan_outbound_add.php
index 4265c7eabd..c095e0a08d 100644
--- a/app/dialplan_outbound/dialplan_outbound_add.php
+++ b/app/dialplan_outbound/dialplan_outbound_add.php
@@ -992,7 +992,7 @@ function type_onchange(dialplan_detail_type) {
 	if ($action == "update") {
 		echo "	<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
 	}
-	echo "		<br><br>";
+	echo "		<br>";
 	echo "		<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "	</td>\n";
 	echo "</tr>";
diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index 8a78a0dd85..e053501da7 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -1872,7 +1872,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "		<input type='hidden' name='delete_type' id='delete_type' value=''>";
 		echo "		<input type='hidden' name='delete_uuid' id='delete_uuid' value=''>";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/fifo/fifo_add.php b/app/fifo/fifo_add.php
index e291529f76..6b770da33d 100644
--- a/app/fifo/fifo_add.php
+++ b/app/fifo/fifo_add.php
@@ -420,7 +420,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if ($action == "update") {
 		echo "	<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
 	}
-	echo "		<br><br>";
+	echo "		<br>";
 	echo "		<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "	</td>\n";
 	echo "</tr>";
diff --git a/app/gateways/gateway_edit.php b/app/gateways/gateway_edit.php
index 2763bea9de..50762ec420 100644
--- a/app/gateways/gateway_edit.php
+++ b/app/gateways/gateway_edit.php
@@ -858,7 +858,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	if ($action == "update") {
 		echo "		<input type='hidden' name='gateway_uuid' value='$gateway_uuid'>\n";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/ivr_menu/ivr_menu_edit.php b/app/ivr_menu/ivr_menu_edit.php
index 67f3659ccf..43de005431 100644
--- a/app/ivr_menu/ivr_menu_edit.php
+++ b/app/ivr_menu/ivr_menu_edit.php
@@ -985,7 +985,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	if (strlen($ivr_menu_uuid) > 0) {
 		echo "		<input type='hidden' name='ivr_menu_uuid' value='$ivr_menu_uuid'>\n";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/ivr_menu/ivr_menu_option_edit.php b/app/ivr_menu/ivr_menu_option_edit.php
index c7fce33c84..2731baf6be 100644
--- a/app/ivr_menu/ivr_menu_option_edit.php
+++ b/app/ivr_menu/ivr_menu_option_edit.php
@@ -333,7 +333,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if ($action == "update") {
 		echo "		<input type='hidden' name='ivr_menu_option_uuid' value='$ivr_menu_option_uuid'>\n";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/modules/module_edit.php b/app/modules/module_edit.php
index 8914c32025..67722e612d 100644
--- a/app/modules/module_edit.php
+++ b/app/modules/module_edit.php
@@ -283,7 +283,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if ($action == "update") {
 		echo "		<input type='hidden' name='module_uuid' value='$module_uuid'>\n";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/recordings/recording_edit.php b/app/recordings/recording_edit.php
index 88ec53e83e..78e3022943 100644
--- a/app/recordings/recording_edit.php
+++ b/app/recordings/recording_edit.php
@@ -234,7 +234,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if ($action == "update") {
 		echo "		<input type='hidden' name='recording_uuid' value='$recording_uuid'>\n";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/ring_groups/ring_group_destination_edit.php b/app/ring_groups/ring_group_destination_edit.php
index 42d26fb97f..204d769598 100644
--- a/app/ring_groups/ring_group_destination_edit.php
+++ b/app/ring_groups/ring_group_destination_edit.php
@@ -260,7 +260,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if ($action == "update") {
 		echo "		<input type='hidden' name='ring_group_destination_uuid' value='$ring_group_destination_uuid'>\n";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/ring_groups/ring_group_edit.php b/app/ring_groups/ring_group_edit.php
index 0a2babb325..8c430ae642 100644
--- a/app/ring_groups/ring_group_edit.php
+++ b/app/ring_groups/ring_group_edit.php
@@ -739,7 +739,7 @@ else {
 	if (strlen($ring_group_uuid) > 0) {
 		echo "		<input type='hidden' name='ring_group_uuid' value='$ring_group_uuid'>\n";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/ring_groups/ring_group_forward_edit.php b/app/ring_groups/ring_group_forward_edit.php
index dc427247fb..1ca0652e10 100644
--- a/app/ring_groups/ring_group_forward_edit.php
+++ b/app/ring_groups/ring_group_forward_edit.php
@@ -167,7 +167,7 @@ require_once "resources/check_auth.php";
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
 	echo "			<input type='hidden' name='id' value='$ring_group_uuid'>\n";
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/schemas/schema_edit.php b/app/schemas/schema_edit.php
index 09629da152..e0b5c3ba8d 100644
--- a/app/schemas/schema_edit.php
+++ b/app/schemas/schema_edit.php
@@ -300,7 +300,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "		<input type='hidden' name='schema_uuid' value='$schema_uuid'>\n";
 	}
 	echo "			<input type='hidden' name='schema_captcha' value='$schema_captcha'>\n";
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/schemas/schema_field_edit.php b/app/schemas/schema_field_edit.php
index e60486a5d6..cf5079ce02 100644
--- a/app/schemas/schema_field_edit.php
+++ b/app/schemas/schema_field_edit.php
@@ -495,7 +495,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if ($action == "update") {
 		echo "		<input type='hidden' name='schema_field_uuid' value='$schema_field_uuid'>\n";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/schemas/schema_import.php b/app/schemas/schema_import.php
index a9882a54cf..a494c9c467 100644
--- a/app/schemas/schema_import.php
+++ b/app/schemas/schema_import.php
@@ -357,7 +357,7 @@ if (count($_POST)>0) {
 
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='import' class='btn' value='".$text['button-import']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/schemas/schema_name_value_edit.php b/app/schemas/schema_name_value_edit.php
index d4d9fb0e45..dc7f026918 100644
--- a/app/schemas/schema_name_value_edit.php
+++ b/app/schemas/schema_name_value_edit.php
@@ -208,7 +208,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if ($action == "update") {
 		echo "		<input type='hidden' name='schema_name_value_uuid' value='$schema_name_value_uuid'>\n";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/services/service_edit.php b/app/services/service_edit.php
index fc52d5799e..4d7cc2840a 100644
--- a/app/services/service_edit.php
+++ b/app/services/service_edit.php
@@ -276,7 +276,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if ($action == "update") {
 		echo "		<input type='hidden' name='service_uuid' value='$service_uuid'>\n";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/settings/setting_edit.php b/app/settings/setting_edit.php
index 72eeb372a7..21ec080601 100644
--- a/app/settings/setting_edit.php
+++ b/app/settings/setting_edit.php
@@ -475,7 +475,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if (permission_exists('setting_edit')) {
 		echo "	<tr>\n";
 		echo "		<td colspan='2' align='right'>\n";
-		echo "			<br><br>";
+		echo "			<br>";
 		echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 		echo "		</td>\n";
 		echo "	</tr>";
diff --git a/app/sip_profiles/sip_profile_edit.php b/app/sip_profiles/sip_profile_edit.php
index d468340d9e..e3b0f2485e 100644
--- a/app/sip_profiles/sip_profile_edit.php
+++ b/app/sip_profiles/sip_profile_edit.php
@@ -236,7 +236,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	if ($action == "update") {
 		echo "		<input type='hidden' name='sip_profile_uuid' value='$sip_profile_uuid'>\n";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/sip_profiles/sip_profile_setting_edit.php b/app/sip_profiles/sip_profile_setting_edit.php
index f7c897f5c0..272b13dc7a 100644
--- a/app/sip_profiles/sip_profile_setting_edit.php
+++ b/app/sip_profiles/sip_profile_setting_edit.php
@@ -247,7 +247,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if ($action == "update") {
 		echo "		<input type='hidden' name='sip_profile_setting_uuid' value='$sip_profile_setting_uuid'>\n";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/vars/var_edit.php b/app/vars/var_edit.php
index 8d2af40312..011b94e140 100644
--- a/app/vars/var_edit.php
+++ b/app/vars/var_edit.php
@@ -294,7 +294,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if ($action == "update") {
 		echo "		<input type='hidden' name='var_uuid' value='$var_uuid'>\n";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/voicemail_greetings/voicemail_greeting_edit.php b/app/voicemail_greetings/voicemail_greeting_edit.php
index d52c3b2298..dffa08835a 100644
--- a/app/voicemail_greetings/voicemail_greeting_edit.php
+++ b/app/voicemail_greetings/voicemail_greeting_edit.php
@@ -210,7 +210,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "		<input type='hidden' name='voicemail_greeting_uuid' value='$voicemail_greeting_uuid'>\n";
 	}
 	echo "			<input type='hidden' name='voicemail_id' value='$voicemail_id'>\n";
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/app/voicemails/voicemail_message_edit.php b/app/voicemails/voicemail_message_edit.php
index 7cc1941b54..d056796055 100644
--- a/app/voicemails/voicemail_message_edit.php
+++ b/app/voicemails/voicemail_message_edit.php
@@ -269,7 +269,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if ($action == "update") {
 		echo "		<input type='hidden' name='voicemail_message_uuid' value='$voicemail_message_uuid'>\n";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='Save'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/core/apps/apps_edit.php b/core/apps/apps_edit.php
index c6f79f873e..b8072e3a5f 100644
--- a/core/apps/apps_edit.php
+++ b/core/apps/apps_edit.php
@@ -203,7 +203,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if ($action == "update") {
 		echo "		<input type='hidden' name='app_uuid' value='$app_uuid'>\n";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/core/databases/database_edit.php b/core/databases/database_edit.php
index a7a5fb2291..b6870e77de 100644
--- a/core/databases/database_edit.php
+++ b/core/databases/database_edit.php
@@ -388,7 +388,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if ($action == "update") {
 		echo "		<input type='hidden' name='database_uuid' value='$database_uuid'>\n";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php
index 2f583e7c05..584f306a33 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/core/default_settings/default_setting_edit.php
@@ -539,7 +539,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	if ($action == "update") {
 		echo "		<input type='hidden' name='default_setting_uuid' value='".$default_setting_uuid."'>\n";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/core/menu/menu_edit.php b/core/menu/menu_edit.php
index ef22fda4af..3600f8666f 100644
--- a/core/menu/menu_edit.php
+++ b/core/menu/menu_edit.php
@@ -231,7 +231,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if ($action == "update") {
 		echo "		<input type='hidden' name='menu_uuid' value='$menu_uuid'>\n";
 	}
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
diff --git a/core/users/usersupdate.php b/core/users/usersupdate.php
index c7187aab7e..8a5787d21b 100644
--- a/core/users/usersupdate.php
+++ b/core/users/usersupdate.php
@@ -715,7 +715,7 @@ else {
 	echo "		<td colspan='2' align='right'><br>";
 	echo "			<input type='hidden' name='id' value=\"$user_uuid\">";
 	echo "			<input type='hidden' name='username_old' value=\"$username\">";
-	echo "			<br><br>";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>";
 	echo "		</td>";
 	echo "	</tr>";