diff --git a/app/extension_settings/extension_setting_edit.php b/app/extension_settings/extension_setting_edit.php
index dfc9c67f0a..94d01a2bd3 100644
--- a/app/extension_settings/extension_setting_edit.php
+++ b/app/extension_settings/extension_setting_edit.php
@@ -69,7 +69,7 @@
 
 //get http post variables and set them to php variables
 	if (!empty($_POST)) {
-		$domain_uuid = $_POST["domain_uuid"];
+		$domain_uuid = $_POST["domain_uuid"] ?? null;
 		$extension_setting_type = $_POST["extension_setting_type"];
 		$extension_setting_name = $_POST["extension_setting_name"];
 		$extension_setting_value = $_POST["extension_setting_value"];
@@ -299,13 +299,13 @@
 	echo "<td class='vtable' style='position: relative;' align='left'>\n";
 	echo "	<select class='formfld' name='extension_setting_type'>\n";
 	echo "		<option value=''></option>\n";
-	if ($extension_setting_type == "param") {
+	if (!empty($extension_setting_type) && $extension_setting_type == "param") {
 		echo "		<option value='param' selected='selected'>".$text['label-param']."</option>\n";
 	}
 	else {
 		echo "		<option value='param'>".$text['label-param']."</option>\n";
 	}
-	if ($extension_setting_type == "variable") {
+	if (!empty($extension_setting_type) && $extension_setting_type == "variable") {
 		echo "		<option value='variable' selected='selected'>".$text['label-variable']."</option>\n";
 	}
 	else {
diff --git a/app/extension_settings/extension_settings.php b/app/extension_settings/extension_settings.php
index 1f2896f1b4..304fc47078 100644
--- a/app/extension_settings/extension_settings.php
+++ b/app/extension_settings/extension_settings.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2021
+	Portions created by the Initial Developer are Copyright (C) 2021-2023
 	the Initial Developer. All Rights Reserved.
 */
 
@@ -178,7 +178,7 @@
 	echo "	<div class='heading'><b>".$text['title-extension_settings']." (".$num_rows.")</b></div>\n";
 	echo "	<div class='actions'>\n";
 
-	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_add','name'=>'btn_add','link'=>'/app/extensions/extension_edit.php?id='.$extension_uuid]);
+	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_add','name'=>'btn_add','style'=>'margin-right: 15px;','link'=>'/app/extensions/extension_edit.php?id='.$extension_uuid]);
 
 	if (permission_exists('extension_setting_add')) {
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','name'=>'btn_add','link'=>'extension_setting_edit.php?extension_uuid='.$extension_uuid]);