diff --git a/app/access_controls/access_control_node_edit.php b/app/access_controls/access_control_node_edit.php
index 08d13ef7c2..277df3fb18 100644
--- a/app/access_controls/access_control_node_edit.php
+++ b/app/access_controls/access_control_node_edit.php
@@ -192,7 +192,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	require_once "resources/header.php";
 
 //show the content
-	echo "<form method='post' name='frm'>\n";
+	echo "<form method='post' name='frm' id='frm'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['title-access_control_node']."</b></div>\n";
diff --git a/app/call_block/call_block_edit.php b/app/call_block/call_block_edit.php
index 23ed8f197e..17021c08a8 100644
--- a/app/call_block/call_block_edit.php
+++ b/app/call_block/call_block_edit.php
@@ -282,7 +282,7 @@
 	require_once "resources/header.php";
 
 //show the content
-	echo "<form method='post' name='frm'>\n";
+	echo "<form method='post' name='frm' id='frm'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'>";
@@ -365,8 +365,8 @@
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	function call_block_action_select($label = false) {
-		global $text, $call_block_app, $call_block_data, $extensions, $voicemails;
-		echo "<select class='formfld' name='call_block_action'>\n";
+		global $select_margin, $text, $call_block_app, $call_block_data, $extensions, $voicemails;
+		echo "<select class='formfld' style='".$select_margin."' name='call_block_action'>\n";
 		if ($label) {
 			echo "	<option value='' disabled='disabled'>".$text['label-action']."</option>\n";
 		}
@@ -508,21 +508,25 @@
 		echo "<div class='action_bar' id='action_bar_sub'>\n";
 		echo "	<div class='heading'><b id='heading_sub'>".$text['heading-recent_calls']."</b></div>\n";
 		echo "	<div class='actions'>\n";
-		echo button::create(['type'=>'button','id'=>'action_bar_sub_button_back','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'collapse'=>'hide-xs','style'=>'margin-right: 15px; display: none;','link'=>'call_block.php']);
-		if (permission_exists('call_block_all')) {
-			echo 	"<select class='formfld' name='extension_uuid'>\n";
-			echo "		<option value='' disabled='disabled'>".$text['label-extension']."</option>\n";
-			echo "		<option value='' selected='selected'>".$text['label-all']."</option>\n";
-			if (is_array($extensions) && sizeof($extensions) != 0) {
-				foreach ($extensions as $row) {
-					$selected = $extension_uuid == $row['extension_uuid'] ? "selected='selected'" : null;
-					echo "	<option value='".urlencode($row["extension_uuid"])."' ".$selected.">".escape($row['extension'])." ".escape($row['description'])."</option>\n";
+		echo button::create(['type'=>'button','id'=>'action_bar_sub_button_back','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'collapse'=>'hide-xs','style'=>'display: none;','link'=>'call_block.php']);
+		if ($result || true) {
+			$select_margin = 'margin-left: 15px;';
+			if (permission_exists('call_block_all')) {
+				echo 	"<select class='formfld' style='".$select_margin."' name='extension_uuid'>\n";
+				echo "		<option value='' disabled='disabled'>".$text['label-extension']."</option>\n";
+				echo "		<option value='' selected='selected'>".$text['label-all']."</option>\n";
+				if (is_array($extensions) && sizeof($extensions) != 0) {
+					foreach ($extensions as $row) {
+						$selected = $extension_uuid == $row['extension_uuid'] ? "selected='selected'" : null;
+						echo "	<option value='".urlencode($row["extension_uuid"])."' ".$selected.">".escape($row['extension'])." ".escape($row['description'])."</option>\n";
+					}
 				}
+				echo "	</select>";
+				unset($select_margin);
 			}
-			echo "	</select>";
+			call_block_action_select(true);
+			echo button::create(['type'=>'button','label'=>$text['button-block'],'icon'=>'ban','collapse'=>'hide-xs','onclick'=>"if (confirm('".$text['confirm-block']."')) { list_form_submit('form_list'); } else { this.blur(); return false; }"]);
 		}
-		call_block_action_select(true);
-		echo button::create(['type'=>'button','label'=>$text['button-block'],'icon'=>'ban','collapse'=>'hide-xs','onclick'=>"if (confirm('".$text['confirm-block']."')) { list_form_submit('form_list'); } else { this.blur(); return false; }"]);
 		echo 	"</div>\n";
 		echo "	<div style='clear: both;'></div>\n";
 		echo "</div>\n";
diff --git a/app/call_broadcast/call_broadcast_edit.php b/app/call_broadcast/call_broadcast_edit.php
index 69d1f3fa30..f2ea7b74f3 100644
--- a/app/call_broadcast/call_broadcast_edit.php
+++ b/app/call_broadcast/call_broadcast_edit.php
@@ -284,7 +284,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	require_once "resources/header.php";
 
 //begin content
-	echo "<form name='frm' method='post' enctype='multipart/form-data'>\n";
+	echo "<form name='frm' id='frm' method='post' enctype='multipart/form-data'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['title-call_broadcast']."</b></div>\n";
diff --git a/app/call_centers/call_center_agent_dashboard.php b/app/call_centers/call_center_agent_dashboard.php
index 67994a1021..6c35982456 100644
--- a/app/call_centers/call_center_agent_dashboard.php
+++ b/app/call_centers/call_center_agent_dashboard.php
@@ -170,7 +170,7 @@
 	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
 
-	echo "<form id='form_list_call_center_agent_dashboard' method='post' action=''>\n";
+	echo "<form id='form_list_call_center_agent_dashboard' method='post'>\n";
 
 	echo "<table class='list'>\n";
 	echo "<tr class='list-header'>\n";
diff --git a/app/call_centers/call_center_agent_status.php b/app/call_centers/call_center_agent_status.php
index ad4e5b79e4..47d6c65ce5 100644
--- a/app/call_centers/call_center_agent_status.php
+++ b/app/call_centers/call_center_agent_status.php
@@ -297,7 +297,7 @@
 	echo $text['description-call_center_agent_status']."\n";
 	echo "<br /><br />\n";
 
-	echo "<form id='form_list' method='post' action=''>\n";
+	echo "<form id='form_list' method='post'>\n";
 
 	echo "<table class='list'>\n";
 	echo "<tr class='list-header'>\n";
diff --git a/app/call_recordings/call_recording_edit.php b/app/call_recordings/call_recording_edit.php
index d84e330d76..1771243c97 100644
--- a/app/call_recordings/call_recording_edit.php
+++ b/app/call_recordings/call_recording_edit.php
@@ -178,7 +178,7 @@
 	require_once "resources/header.php";
 
 //show the content
-	echo "<form name='frm' id='frm' method='post' action=''>\n";
+	echo "<form name='frm' id='frm' method='post'>\n";
 	echo "<table width='100%'  border='0' cellpadding='0' cellspacing='0'>\n";
 
 	echo "<tr>\n";
diff --git a/app/calls/call_edit.php b/app/calls/call_edit.php
index fb0238dfb5..757b8fd3a8 100644
--- a/app/calls/call_edit.php
+++ b/app/calls/call_edit.php
@@ -498,7 +498,7 @@
 	$token = $object->create($_SERVER['PHP_SELF']);
 
 //show the content
-	echo "<form method='post' name='frm'>\n";
+	echo "<form method='post' name='frm' id='frm'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['title-call_routing']."</b></div>\n";
diff --git a/app/conference_centers/conference_center_edit.php b/app/conference_centers/conference_center_edit.php
index 1cabb3ba76..d5de5405cc 100644
--- a/app/conference_centers/conference_center_edit.php
+++ b/app/conference_centers/conference_center_edit.php
@@ -264,7 +264,7 @@
 	require_once "resources/header.php";
 
 //show the content
-	echo "<form name='frm' id='frm' method='post' action=''>\n";
+	echo "<form name='frm' id='frm' method='post'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['title-conference_center']."</b></div>\n";
diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php
index 17e74fe5dd..4a79e270d6 100644
--- a/app/conference_centers/conference_room_edit.php
+++ b/app/conference_centers/conference_room_edit.php
@@ -569,7 +569,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	require_once "resources/header.php";
 
 //show the content
-	echo "<form method='post' name='frm' action=''>\n";
+	echo "<form method='post' name='frm' id='frm'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['title-conference_room']."</b></div>\n";
diff --git a/app/conference_profiles/conference_profile_edit.php b/app/conference_profiles/conference_profile_edit.php
index e93d10404b..156ee1481b 100644
--- a/app/conference_profiles/conference_profile_edit.php
+++ b/app/conference_profiles/conference_profile_edit.php
@@ -126,7 +126,7 @@
 	require_once "resources/header.php";
 
 //show the content
-	echo "<form name='frm' id='frm' method='post' action=''>\n";
+	echo "<form name='frm' id='frm' method='post'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['title-conference_profile']."</b></div>\n";
diff --git a/app/conferences/conference_edit.php b/app/conferences/conference_edit.php
index 9e61e65360..2a21ffc44e 100644
--- a/app/conferences/conference_edit.php
+++ b/app/conferences/conference_edit.php
@@ -317,7 +317,7 @@
 	require_once "resources/header.php";
 
 //show the content
-	echo "<form method='post' name='frm'>\n";
+	echo "<form method='post' name='frm' id='frm'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'>";
diff --git a/app/contacts/contact_address_edit.php b/app/contacts/contact_address_edit.php
index f7a6de90db..60ffa02049 100644
--- a/app/contacts/contact_address_edit.php
+++ b/app/contacts/contact_address_edit.php
@@ -237,7 +237,7 @@
 	echo "</script>";
 
 //show the content
-	echo "<form method='post' name='frm'>\n";
+	echo "<form method='post' name='frm' id='frm'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'>";
diff --git a/app/contacts/contact_attachment_edit.php b/app/contacts/contact_attachment_edit.php
index 9206989929..8009d0300e 100644
--- a/app/contacts/contact_attachment_edit.php
+++ b/app/contacts/contact_attachment_edit.php
@@ -152,7 +152,7 @@
 	require_once "resources/header.php";
 
 //show the content
-	echo "<form method='post' name='frm' enctype='multipart/form-data'>\n";
+	echo "<form method='post' name='frm' id='frm' enctype='multipart/form-data'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'>";
diff --git a/app/contacts/contact_email_edit.php b/app/contacts/contact_email_edit.php
index 277628c717..6d41d4fec8 100644
--- a/app/contacts/contact_email_edit.php
+++ b/app/contacts/contact_email_edit.php
@@ -209,7 +209,7 @@ if (is_uuid($_GET["contact_uuid"])) {
 	echo "</script>";
 
 //show the content
-	echo "<form method='post' name='frm'>\n";
+	echo "<form method='post' name='frm' id='frm'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'>";
diff --git a/app/contacts/contact_timer.php b/app/contacts/contact_timer.php
index 5a9ca76f99..15a61dbfe7 100644
--- a/app/contacts/contact_timer.php
+++ b/app/contacts/contact_timer.php
@@ -334,7 +334,7 @@ if (!permission_exists('contact_time_add')) { echo "access denied"; exit; }
 	<br><br>
 	<div id='ajax_reponse' class='timer_<?php echo escape($timer_state);?>'>00:00:00</div>
 	<br>
-	<form name='frm' id='frm' method='post' action=''>
+	<form name='frm' id='frm' method='post'>
 	<input type='hidden' name='domain_uuid' value="<?php echo escape($domain_uuid); ?>">
 	<input type='hidden' name='contact_time_uuid' value="<?php echo escape($contact_time_uuid); ?>">
 	<input type='hidden' name='contact_uuid' value="<?php echo escape($contact_uuid); ?>">
diff --git a/app/contacts/contact_url_edit.php b/app/contacts/contact_url_edit.php
index 6887960979..c7bf4a9515 100644
--- a/app/contacts/contact_url_edit.php
+++ b/app/contacts/contact_url_edit.php
@@ -210,7 +210,7 @@
 	echo "</script>";
 
 //show the content
-	echo "<form method='post' name='frm'>\n";
+	echo "<form method='post' name='frm' id='frm'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'>";
diff --git a/app/destinations/destination_edit.php b/app/destinations/destination_edit.php
index 898fccbd82..88a79dc57d 100644
--- a/app/destinations/destination_edit.php
+++ b/app/destinations/destination_edit.php
@@ -864,7 +864,7 @@
 	echo "</script>\n";
 
 //show the content
-	echo "<form method='post' name='frm'>\n";
+	echo "<form method='post' name='frm' id='frm'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'>";
diff --git a/app/devices/device_download.php b/app/devices/device_download.php
index 69b218ffda..ae70f8464b 100644
--- a/app/devices/device_download.php
+++ b/app/devices/device_download.php
@@ -132,7 +132,7 @@
 	require_once "resources/header.php";
 
 //show the content
-	echo "<form method='post' name='frm'>\n";
+	echo "<form method='post' name='frm' id='frm'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['header-device_export']."</b></div>\n";
diff --git a/app/devices/device_profile_edit.php b/app/devices/device_profile_edit.php
index 9f3ef9102a..728f23d1a9 100644
--- a/app/devices/device_profile_edit.php
+++ b/app/devices/device_profile_edit.php
@@ -357,7 +357,7 @@
 	require_once "resources/header.php";
 
 //show the content
-	echo "<form name='frm' id='frm' method='post' action=''>\n";
+	echo "<form name='frm' id='frm' method='post'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['title-device_profile']."</b></div>\n";
diff --git a/app/devices/device_vendor_function_edit.php b/app/devices/device_vendor_function_edit.php
index 550181a44d..d35f5b91a7 100644
--- a/app/devices/device_vendor_function_edit.php
+++ b/app/devices/device_vendor_function_edit.php
@@ -267,7 +267,7 @@
 	require_once "resources/header.php";
 
 //show the content
-	echo "<form name='frm' id='frm' method='post' action=''>\n";
+	echo "<form name='frm' id='frm' method='post'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['title-device_vendor_function']."</b></div>\n";
diff --git a/app/dialplan_inbound/dialplan_inbound_add.php b/app/dialplan_inbound/dialplan_inbound_add.php
index d18456716a..3fb417af40 100644
--- a/app/dialplan_inbound/dialplan_inbound_add.php
+++ b/app/dialplan_inbound/dialplan_inbound_add.php
@@ -476,7 +476,7 @@
 <?php
 
 //show the content
-	echo "<form method='post' name='frm'>\n";
+	echo "<form method='post' name='frm' id='frm'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['title-dialplan-inbound-add']."</b></div>\n";
diff --git a/app/dialplans/dialplan_add.php b/app/dialplans/dialplan_add.php
index 814b907474..0f12e956e9 100644
--- a/app/dialplans/dialplan_add.php
+++ b/app/dialplans/dialplan_add.php
@@ -239,7 +239,7 @@
 	require_once "resources/header.php";
 
 //show the content
-	echo "<form method='post' name='frm'>\n";
+	echo "<form method='post' name='frm' id='frm'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['header-dialplan-add']."</b></div>\n";
diff --git a/app/extensions/extension_download.php b/app/extensions/extension_download.php
index 248a1ebb7d..4ade0e978c 100644
--- a/app/extensions/extension_download.php
+++ b/app/extensions/extension_download.php
@@ -169,7 +169,7 @@
 	require_once "resources/header.php";
 
 //show the content
-	echo "<form method='post' name='frm'>\n";
+	echo "<form method='post' name='frm' id='frm'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['header-extension_export']."</b></div>\n";
diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index 4332cbc60b..57f414362c 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -822,7 +822,7 @@
 	echo "}\n";
 	echo "</script>";
 
-	echo "<form method='post' name='frm' id='frm' action=''>\n";
+	echo "<form method='post' name='frm' id='frm'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'>";
diff --git a/app/fax/fax_edit.php b/app/fax/fax_edit.php
index 616e3b187f..70154625b2 100644
--- a/app/fax/fax_edit.php
+++ b/app/fax/fax_edit.php
@@ -498,7 +498,7 @@
 	echo "</script>\n";
 
 //show the content
-	echo "<form method='post' name='frm'>\n";
+	echo "<form method='post' name='frm' id='frm'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['header-fax_server_settings']."</b></div>\n";
diff --git a/app/fax/fax_log_view.php b/app/fax/fax_log_view.php
index 2bcc31b310..20d5794c28 100644
--- a/app/fax/fax_log_view.php
+++ b/app/fax/fax_log_view.php
@@ -111,7 +111,7 @@
 	require_once "resources/header.php";
 
 //show the content
-	echo "<form method='post' name='frm'>\n";
+	echo "<form method='post' name='frm' id='frm'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['title-fax_log']."</b></div>\n";
diff --git a/app/fax/fax_send.php b/app/fax/fax_send.php
index 7b844f0fcb..acad795a31 100644
--- a/app/fax/fax_send.php
+++ b/app/fax/fax_send.php
@@ -906,7 +906,7 @@ if (!$included) {
 		echo "</script>";
 
 	//show the content
-		echo "<form method='post' name='frm' enctype='multipart/form-data'>\n";
+		echo "<form method='post' name='frm' id='frm' enctype='multipart/form-data'>\n";
 
 		echo "<div class='action_bar' id='action_bar'>\n";
 		echo "	<div class='heading'><b>".$text['header-new_fax']."</b></div>\n";
diff --git a/app/fifo/fifo_add.php b/app/fifo/fifo_add.php
index a9ac1a9d8f..4f935ffeef 100644
--- a/app/fifo/fifo_add.php
+++ b/app/fifo/fifo_add.php
@@ -295,7 +295,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	$document['title'] = $text['title-queue_add'];
 
 //show the content
-	echo "<form method='post' name='frm'>\n";
+	echo "<form method='post' name='frm' id='frm'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['header-queue_add']."</b></div>\n";
diff --git a/app/gswave/index.php b/app/gswave/index.php
index 11cccf325b..c00ecd007b 100644
--- a/app/gswave/index.php
+++ b/app/gswave/index.php
@@ -120,7 +120,7 @@
 	require_once "resources/header.php";
 
 //show the content
-	echo "<form name='frm' method='get'>\n";
+	echo "<form name='frm' id='frm' method='get'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['title-gswave']."</b></div>\n";
diff --git a/app/modules/module_edit.php b/app/modules/module_edit.php
index 868beb3735..f678568fa9 100644
--- a/app/modules/module_edit.php
+++ b/app/modules/module_edit.php
@@ -174,7 +174,7 @@
 	require_once "resources/header.php";
 
 //show the content
-	echo "<form method='post' name='frm'>\n";
+	echo "<form method='post' name='frm' id='frm'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'>";
diff --git a/app/music_on_hold/music_on_hold_edit.php b/app/music_on_hold/music_on_hold_edit.php
index bed0fceca5..922f6d63aa 100644
--- a/app/music_on_hold/music_on_hold_edit.php
+++ b/app/music_on_hold/music_on_hold_edit.php
@@ -207,7 +207,7 @@
 	require_once "resources/header.php";
 
 //show the content
-	echo "<form name='frm' id='frm' method='post' action=''>\n";
+	echo "<form name='frm' id='frm' method='post'>\n";
 	echo "<table width='100%'  border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo "<td align='left' width='30%' nowrap='nowrap' valign='top'><b>".$text['title-music_on_hold']."</b><br><br></td>\n";
diff --git a/app/pin_numbers/pin_download.php b/app/pin_numbers/pin_download.php
index d46bc6088c..085798a8f1 100644
--- a/app/pin_numbers/pin_download.php
+++ b/app/pin_numbers/pin_download.php
@@ -123,7 +123,7 @@
 	require_once "resources/header.php";
 
 //show the content
-	echo "<form method='post' name='frm'>\n";
+	echo "<form method='post' name='frm' id='frm'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['header-export']."</b></div>\n";
diff --git a/app/recordings/recording_edit.php b/app/recordings/recording_edit.php
index cc63213c6b..dec3daef5f 100644
--- a/app/recordings/recording_edit.php
+++ b/app/recordings/recording_edit.php
@@ -145,7 +145,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	require_once "resources/header.php";
 
 //show the content
-	echo "<form method='post' name='frm' action=''>\n";
+	echo "<form method='post' name='frm' id='frm'>\n";
 
 	echo "<table border='0' cellpadding='0' cellspacing='0' align='right'>\n";
 	echo "<tr>\n";
diff --git a/app/time_conditions/time_condition_edit.php b/app/time_conditions/time_condition_edit.php
index 635f4cfac7..e085e17ff1 100644
--- a/app/time_conditions/time_condition_edit.php
+++ b/app/time_conditions/time_condition_edit.php
@@ -898,7 +898,7 @@
 </script>
 
 <?php
-echo "<form method='post' name='frm' onsubmit=\"return check_submit();\">\n";
+echo "<form method='post' name='frm' id='frm' onsubmit=\"return check_submit();\">\n";
 
 echo "<div class='action_bar' id='action_bar'>\n";
 echo "	<div class='heading'><b>".$text['title-time_condition']."</b></div>\n";
diff --git a/app/vars/var_edit.php b/app/vars/var_edit.php
index 60f4eade82..0800cd2797 100644
--- a/app/vars/var_edit.php
+++ b/app/vars/var_edit.php
@@ -184,7 +184,7 @@
 	require_once "resources/header.php";
 
 //show contents
-	echo "<form method='post' name='frm'>\n";
+	echo "<form method='post' name='frm' id='frm'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['header-variable']."</b></div>\n";
diff --git a/app/voicemail_greetings/voicemail_greeting_edit.php b/app/voicemail_greetings/voicemail_greeting_edit.php
index 1791c1fc94..401abe947f 100644
--- a/app/voicemail_greetings/voicemail_greeting_edit.php
+++ b/app/voicemail_greetings/voicemail_greeting_edit.php
@@ -130,7 +130,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	require_once "resources/header.php";
 
 //show the content
-	echo "<form method='post' name='frm' action=''>\n";
+	echo "<form method='post' name='frm' id='frm'>\n";
 
 	echo "<table cellpadding='0' cellspacing='0' border='0' align='right'>\n";
 	echo "<tr>\n";
diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php
index 89d61e4a2d..75ab6cb73d 100644
--- a/app/xml_cdr/xml_cdr.php
+++ b/app/xml_cdr/xml_cdr.php
@@ -211,7 +211,7 @@
 
 //basic search of call detail records
 	if (permission_exists('xml_cdr_search')) {
-		echo "<form method='get' action=''>\n";
+		echo "<form name='frm' id='frm' method='get'>\n";
 
 		echo "<div class='form_grid'>\n";
 
diff --git a/app/xml_cdr/xml_cdr_extension_summary.php b/app/xml_cdr/xml_cdr_extension_summary.php
index 2c2e0e24e0..bae0537485 100644
--- a/app/xml_cdr/xml_cdr_extension_summary.php
+++ b/app/xml_cdr/xml_cdr_extension_summary.php
@@ -124,7 +124,7 @@
 	echo "</div>\n";
 
 	if (permission_exists('xml_cdr_search')) {
-		echo "<form name='frm' id='frm' method='get' action=''>\n";
+		echo "<form name='frm' id='frm' method='get'>\n";
 
 		echo "<div class='form_grid' style='padding-bottom: 35px;'>\n";
 
diff --git a/resources/login.php b/resources/login.php
index c2858a96eb..6d4cc98ae4 100644
--- a/resources/login.php
+++ b/resources/login.php
@@ -267,7 +267,7 @@
 		echo "</div>";
 
 		echo "<div id='request_form' style='display: none;'>\n";
-		echo "<form name='request' method='post' action=''>\n";
+		echo "<form name='request' method='post'>\n";
 		echo "<input type='hidden' name='action' value='request'>\n";
 		echo "<input type='text' class='txt login' style='text-align: center; min-width: 200px; width: 200px; margin-bottom: 8px;' name='email' id='email' placeholder=\"".$text['label-email_address']."\"><br />\n";
 		echo "<input type='submit' id='btn_reset' class='btn' style='width: 100px; margin-top: 15px;' value='".$text['button-reset']."'>\n";
@@ -353,7 +353,7 @@
 		echo "</script>\n";
 
 		echo "<span id='reset_form'>\n";
-		echo "<form name='reset' id='frm' method='post' action=''>\n";
+		echo "<form name='reset' id='frm' method='post'>\n";
 		echo "<input type='hidden' name='action' value='reset'>\n";
 		echo "<input type='text' class='txt login' style='text-align: center; min-width: 200px; width: 200px; margin-bottom: 8px;' name='username' id='username' placeholder=\"".$text['label-username']."\"><br />\n";
 		echo "<input type='password' class='txt login' style='text-align: center; min-width: 200px; width: 200px; margin-bottom: 4px;' name='password_new' id='password' autocomplete='off' placeholder=\"".$text['label-new_password']."\" onkeypress='show_strenth_meter();' onfocus='compare_passwords();' onkeyup='compare_passwords();' onblur='compare_passwords();'><br />\n";