diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php
index ad1255dc67..c4b25cef93 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/core/default_settings/default_setting_edit.php
@@ -315,7 +315,14 @@
 	echo "	".$text['label-type']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld lowercase' type='text' name='default_setting_name' id='default_setting_name' maxlength='255' value=\"".escape($default_setting_name)."\">\n";
+	$setting_types = ['Array','Boolean','Code','Dir','Name','Numeric','Text','UUID'];
+	echo "	<select class='formfld' id='default_setting_name' name='default_setting_name' required='required'>\n";
+	echo "		<option value=''></option>\n";
+	foreach ($setting_types as $setting_type) {
+		echo "	<option value='".strtolower($setting_type)."' ".($default_setting_name == strtolower($setting_type) ? "selected='selected'" : null).">".$setting_type."</option>\n";
+	}
+	echo "	</select>\n";
+	unset($setting_types, $setting_type);
 	echo "<br />\n";
 	echo $text['description-type']."\n";
 	echo "</td>\n";
diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php
index 4519fc462c..3fdadfd65b 100644
--- a/core/default_settings/default_settings.php
+++ b/core/default_settings/default_settings.php
@@ -422,7 +422,8 @@
 				echo escape($row['default_setting_subcategory']);
 			}
 			echo "	</td>\n";
-			echo "	<td class='hide-sm-dn'>".escape($row['default_setting_name'])."</td>\n";
+			$setting_types = ['Array','Boolean','Code','Dir','Name','Numeric','Text','UUID'];
+			echo "	<td class='hide-sm-dn'>".$setting_types[array_search(strtolower($row['default_setting_name']), array_map('strtolower',$setting_types))]."</td>\n";
 			echo "	<td class='overflow no-wrap' title=\"".escape($default_value)."\" style=\"".$setting_bold."\">\n";
 
 			$category = $row['default_setting_category'];
@@ -499,6 +500,9 @@
 			else if ($category == 'destinations' && $subcategory == 'select_mode' && $name == 'text') {
 				echo "		".$text['label-'.$row['default_setting_value']]."\n";
 			}
+			else if ($row['default_setting_value'] == 'true' || $row['default_setting_value'] == 'false') {
+				echo "		".$text['label-'.$row['default_setting_value']]."\n";
+			}
 			else {
 				echo "		".escape($row['default_setting_value'])."\n";
 			}
diff --git a/core/domain_settings/domain_setting_edit.php b/core/domain_settings/domain_setting_edit.php
index 8f28fed5e0..7796e76734 100644
--- a/core/domain_settings/domain_setting_edit.php
+++ b/core/domain_settings/domain_setting_edit.php
@@ -433,7 +433,14 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "	".$text['label-type']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld lowercase' type='text' name='domain_setting_name' id='domain_setting_name' maxlength='255' value=\"".escape($domain_setting_name)."\">\n";
+	$setting_types = ['Array','Boolean','Code','Dir','Name','Numeric','Text','UUID'];
+	echo "	<select class='formfld' id='domain_setting_name' name='domain_setting_name' required='required'>\n";
+	echo "		<option value=''></option>\n";
+	foreach ($setting_types as $setting_type) {
+		echo "	<option value='".strtolower($setting_type)."' ".($domain_setting_name == strtolower($setting_type) ? "selected='selected'" : null).">".$setting_type."</option>\n";
+	}
+	echo "	</select>\n";
+	unset($setting_types, $setting_type);
 	echo "<br />\n";
 	echo $text['description-type']."\n";
 	echo "</td>\n";
diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php
index 41099d5b07..b897291619 100644
--- a/core/domain_settings/domain_settings.php
+++ b/core/domain_settings/domain_settings.php
@@ -279,7 +279,8 @@
 				echo escape($row['domain_setting_subcategory']);
 			}
 			echo "	</td>\n";
-			echo "	<td class='hide-sm-dn'>".escape($row['domain_setting_name'])."</td>\n";
+			$setting_types = ['Array','Boolean','Code','Dir','Name','Numeric','Text','UUID'];
+			echo "	<td class='hide-sm-dn'>".$setting_types[array_search(strtolower($row['domain_setting_name']), array_map('strtolower',$setting_types))]."</td>\n";
 			echo "	<td class='overflow no-wrap'>\n";
 			$category = $row['domain_setting_category'];
 			$subcategory = $row['domain_setting_subcategory'];
@@ -354,6 +355,9 @@
 			else if ($category == 'destinations' && $subcategory == 'select_mode' && $name == 'text') {
 				echo "		".$text['label-'.$row['domain_setting_value']]."\n";
 			}
+			else if ($row['domain_setting_value'] == 'true' || $row['domain_setting_value'] == 'false') {
+				echo "		".$text['label-'.$row['domain_setting_value']]."\n";
+			}
 			else {
 				echo "		".escape($row['domain_setting_value'])."\n";
 			}
diff --git a/core/user_settings/user_setting_edit.php b/core/user_settings/user_setting_edit.php
index fdc27ab7a5..89027185db 100644
--- a/core/user_settings/user_setting_edit.php
+++ b/core/user_settings/user_setting_edit.php
@@ -424,7 +424,14 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "	".$text['label-type']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld lowercase' type='text' name='user_setting_name' id='user_setting_name' maxlength='255' value=\"".escape($user_setting_name)."\">\n";
+	$setting_types = ['Array','Boolean','Code','Dir','Name','Numeric','Text','UUID'];
+	echo "	<select class='formfld' id='user_setting_name' name='user_setting_name' required='required'>\n";
+	echo "		<option value=''></option>\n";
+	foreach ($setting_types as $setting_type) {
+		echo "	<option value='".strtolower($setting_type)."' ".($user_setting_name == strtolower($setting_type) ? "selected='selected'" : null).">".$setting_type."</option>\n";
+	}
+	echo "	</select>\n";
+	unset($setting_types, $setting_type);
 	echo "<br />\n";
 	echo $text['description-type']."\n";
 	echo "</td>\n";
diff --git a/core/user_settings/user_settings.php b/core/user_settings/user_settings.php
index a153674b99..0c84ed5611 100644
--- a/core/user_settings/user_settings.php
+++ b/core/user_settings/user_settings.php
@@ -243,7 +243,8 @@
 				echo escape($row['user_setting_subcategory']);
 			}
 			echo "	</td>\n";
-			echo "	<td class='hide-sm-dn'>".$row['user_setting_name']."&nbsp;</td>\n";
+			$setting_types = ['Array','Boolean','Code','Dir','Name','Numeric','Text','UUID'];
+			echo "	<td class='hide-sm-dn'>".$setting_types[array_search(strtolower($row['user_setting_name']), array_map('strtolower',$setting_types))]."</td>\n";
 			echo "	<td class='overflow no-wrap'>\n";
 			$category = $row['user_setting_category'];
 			$subcategory = $row['user_setting_subcategory'];
@@ -315,6 +316,9 @@
 			else if ($category == 'destinations' && $subcategory == 'select_mode' && $name == 'text') {
 				echo "		".$text['label-'.$row['user_setting_value']]."\n";
 			}
+			else if ($row['user_setting_value'] == 'true' || $row['user_setting_value'] == 'false') {
+				echo "		".$text['label-'.$row['user_setting_value']]."\n";
+			}
 			else {
 				echo "		".escape($row['user_setting_value'])."\n";
 			}
diff --git a/resources/app_languages.php b/resources/app_languages.php
index 31ba8fbdc1..c866f09f4e 100644
--- a/resources/app_languages.php
+++ b/resources/app_languages.php
@@ -4503,8 +4503,8 @@ $text['description-value']['sv-se'] = "Ange värdet på inställningen.";
 $text['description-value']['uk-ua'] = "Введіть значенння змінної";
 $text['description-value']['tr-tr'] = "Değer girin.";
 
-$text['description-type']['en-us'] = "Enter the setting type (ie. uuid, name, var, dir, etc).";
-$text['description-type']['en-gb'] = "Enter the setting type (ie. uuid, name, var, dir, etc).";
+$text['description-type']['en-us'] = "Select the data type.";
+$text['description-type']['en-gb'] = "Select the data type.";
 $text['description-type']['ar-eg'] = "";
 $text['description-type']['de-at'] = "Geben Sie den Typ für diese Einstellung an (z.B. uuid, name, var, dir, etc)."; //copied from de-de
 $text['description-type']['de-ch'] = "Geben Sie den Typ für diese Einstellung an (z.B. uuid, name, var, dir, etc)."; //copied from de-de