diff --git a/app/contacts/contact_import.php b/app/contacts/contact_import.php
index ec34ba99c4..ab4ed28407 100644
--- a/app/contacts/contact_import.php
+++ b/app/contacts/contact_import.php
@@ -112,8 +112,8 @@
 					$schema[$i]['table'] = $table_name;
 					$schema[$i]['parent'] = $parent_name;
 					foreach ($table['fields'] as $row) {
-						if (!empty($row['deprecated']) && $row['deprecated'] !== 'true') {
-							if (!empty($row['name'])) {
+						if (empty($row['deprecated']) || !empty($row['deprecated']) && $row['deprecated'] !== 'true') {
+							if (!empty($row['name']['text'])) {
 								$field_name = $row['name']['text'];
 							}
 							else {
@@ -274,9 +274,9 @@
 			}
 
 		//user selected fields, labels
-			$fields = $_POST['fields'];
+			$fields = $_POST['fields'] ?? [];
 			$labels = $_POST['labels'] ?? [];
-			
+
 		//set the domain_uuid
 			$domain_uuid = $_SESSION['domain_uuid'];
 
diff --git a/app/extensions/extensions.php b/app/extensions/extensions.php
index 00937bed74..936ace779d 100644
--- a/app/extensions/extensions.php
+++ b/app/extensions/extensions.php
@@ -171,7 +171,7 @@
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['header-extensions']." (".$num_rows.")</b></div>\n";
 	echo "	<div class='actions'>\n";
-	if (permission_exists('extension_import') && (!isset($_SESSION['limit']['extensions']['numeric']) || $total_extensions < $_SESSION['limit']['extensions']['numeric'])) {
+	if (permission_exists('extension_import') || (!isset($_SESSION['limit']['extensions']['numeric']) || $total_extensions < $_SESSION['limit']['extensions']['numeric'])) {
 		echo button::create(['type'=>'button','label'=>$text['button-import'],'icon'=>$_SESSION['theme']['button_icon_import'],'link'=>'extension_imports.php']);
 	}
 	if (permission_exists('extension_export')) {