diff --git a/app/destinations/destination_edit.php b/app/destinations/destination_edit.php
index 0ce80b64ee..c570c92fc4 100644
--- a/app/destinations/destination_edit.php
+++ b/app/destinations/destination_edit.php
@@ -240,7 +240,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<select class='formfld' name='destination_type'>\n";
-	echo "	<option value=''></option>\n";
 	switch ($destination_type) {
 		case "inbound" : 	$selected[1] = "selected='selected'";	break;
 		case "outbound" : 	$selected[2] = "selected='selected'";	break;
@@ -334,7 +333,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<select class='formfld' name='destination_enabled'>\n";
-	echo "	<option value=''></option>\n";
 	switch ($destination_enabled) {
 		case "true" :	$selected[1] = "selected='selected'";	break;
 		case "false" :	$selected[2] = "selected='selected'";	break;
diff --git a/app/dialplan/dialplan_edit.php b/app/dialplan/dialplan_edit.php
index c3763f3d97..73f6355b9e 100644
--- a/app/dialplan/dialplan_edit.php
+++ b/app/dialplan/dialplan_edit.php
@@ -382,7 +382,6 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
 		echo "    <select class='formfld' name='dialplan_continue'>\n";
-		echo "    <option value=''></option>\n";
 		if ($dialplan_continue == "true") {
 			echo "    <option value='true' selected='selected'>".$text['option-true']."</option>\n";
 		}
@@ -437,7 +436,6 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
 		echo "    <select class='formfld' name='dialplan_enabled'>\n";
-		echo "    <option value=''></option>\n";
 		if ($dialplan_enabled == "true") {
 			echo "    <option value='true' selected='selected'>".$text['option-true']."</option>\n";
 		}
diff --git a/app/gateways/app_languages.php b/app/gateways/app_languages.php
index d90ae1f1e0..dbf3ffb343 100644
--- a/app/gateways/app_languages.php
+++ b/app/gateways/app_languages.php
@@ -197,19 +197,19 @@
 	$text['description-channels']['es-cl'] = "Número máximo de canales simultaneos disponibles en la pasarela.";
 	$text['description-channels']['pt-pt'] = "Número máximo de canais simultâneos no gateway.";
 
-	$text['label-caller_id_in_from']['en-us'] = "Caller Id In From";
-	$text['label-caller_id_in_from']['es-cl'] = "Caller Id In From";
-	$text['label-caller_id_in_from']['pt-pt'] = "Caller Id In From";
-	$text['label-caller_id_in_from']['fr-fr'] = "Caller Id In From";
+	$text['label-caller_id_in_from']['en-us'] = "Caller ID In From";
+	$text['label-caller_id_in_from']['es-cl'] = "Caller ID In From";
+	$text['label-caller_id_in_from']['pt-pt'] = "Caller ID In From";
+	$text['label-caller_id_in_from']['fr-fr'] = "Caller ID In From";
 
 	$text['description-caller_id_in_from']['en-us'] = "Enter the caller-id-in-from.";
 	$text['description-caller_id_in_from']['es-cl'] = "Ingrese la parte caller-id-in-from de la cabecera SIP";
 	$text['description-caller_id_in_from']['pt-pt'] = "Introduza o caller-id-in-from";
 	$text['description-caller_id_in_from']['fr-fr'] = "Insérer ici la partie Caller-id à utiliser dans le header SIP From.";
 
-	$text['label-supress_cng']['en-us'] = "Supress Cng";
-	$text['label-supress_cng']['es-cl'] = "Suprimir Cng";
-	$text['label-supress_cng']['pt-pt'] = "Supress Cng";
+	$text['label-supress_cng']['en-us'] = "Supress CNG";
+	$text['label-supress_cng']['es-cl'] = "Suprimir CNG";
+	$text['label-supress_cng']['pt-pt'] = "Supress CNG";
 	$text['label-supress_cng']['fr-fr'] = "suppression du silence";
 
 	$text['description-supress_cng']['en-us'] = "Enter the supress-cng";
diff --git a/app/gateways/gateway_edit.php b/app/gateways/gateway_edit.php
index d96162a222..26ba806810 100644
--- a/app/gateways/gateway_edit.php
+++ b/app/gateways/gateway_edit.php
@@ -487,7 +487,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "    <select class='formfld' name='register'>\n";
-	echo "    <option value=''></option>\n";
 	if ($register == "true") {
 		echo "    <option value='true' selected='selected'>".$text['label-true']."</option>\n";
 	}
@@ -791,7 +790,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<select class='formfld' name='enabled'>\n";
-	echo "	<option value=''></option>\n";
 	if ($enabled == "true") {
 		echo "	<option value='true' selected='selected'>".$text['label-true']."</option>\n";
 	}
diff --git a/core/users/usersupdate.php b/core/users/usersupdate.php
index 8d85e7aa2c..1db64eb832 100644
--- a/core/users/usersupdate.php
+++ b/core/users/usersupdate.php
@@ -410,7 +410,7 @@ else {
 	$sql .= "where domain_uuid = '".$domain_uuid."' ";
 	$prep_statement = $db->prepare(check_sql($sql));
 	$prep_statement->execute();
-	echo "<select name=\"group_name\" class='frm'>\n";
+	echo "<select name=\"group_name\" class='formfld' style='width: auto; margin-right: 3px;'>\n";
 	echo "<option value=\"\"></option>\n";
 	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
 	foreach($result as $field) {
@@ -617,8 +617,7 @@ else {
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "    <select class='formfld' name='user_enabled'>\n";
-	echo "    <option value=''></option>\n";
-	if ($user_enabled == "true" || $user_enabled == "") {
+	if ($user_enabled == "true") {
 		echo "    <option value='true' selected='selected'>".$text['option-true']."</option>\n";
 	}
 	else {