diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index 9ab9ad05f9..71633037b9 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -43,6 +43,10 @@
 	$language = new text;
 	$text = $language->get();
 
+//set the defaults
+	$device_model = '';
+	$device_firmware_version = '';
+
 //include the device class
 	require_once "app/devices/resources/classes/device.php";
 
@@ -57,7 +61,7 @@
 
 //get total device count from the database, check limit, if defined
 	if ($action == 'add') {
-		if ($_SESSION['limit']['devices']['numeric'] != '') {
+		if (!empty($_SESSION['limit']['devices']['numeric']) && $_SESSION['limit']['devices']['numeric']) {
 			$sql = "select count(*) from v_devices where domain_uuid = :domain_uuid ";
 			$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 			$database = new database;
diff --git a/app/devices/device_vendor_function_edit.php b/app/devices/device_vendor_function_edit.php
index 452eda8b72..249e600502 100644
--- a/app/devices/device_vendor_function_edit.php
+++ b/app/devices/device_vendor_function_edit.php
@@ -31,11 +31,13 @@
 //includes files
 	require_once "resources/require.php";
 
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
 
+//set the defaults
+	$device_vendor_function_uuid = '';
+
 //delete the group from the menu item
 	if (!empty($_REQUEST["a"]) && $_REQUEST["a"] == "delete" && permission_exists("device_vendor_function_delete") && !empty($_REQUEST["id"])) {
 		//get the id
@@ -402,4 +404,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/dialplan_inbound/dialplan_inbound_add.php b/app/dialplan_inbound/dialplan_inbound_add.php
index 0e20dafc65..6ff9994410 100644
--- a/app/dialplan_inbound/dialplan_inbound_add.php
+++ b/app/dialplan_inbound/dialplan_inbound_add.php
@@ -51,6 +51,9 @@
 //set the defaults
 	$dialplan_name = '';
 	$dialplan_description = '';
+	$condition_expression_1 = '';
+	$condition_expression_2 = '';
+	$action_2 = '';
 	$limit = '';
 
 //get the http get values and set them as php variables