diff --git a/app/gateways/app_languages.php b/app/gateways/app_languages.php
index 7a1e0a39e6..658ae93aef 100644
--- a/app/gateways/app_languages.php
+++ b/app/gateways/app_languages.php
@@ -12,8 +12,8 @@
 	$text['description-gateway-edit']['en-us'] = 'Defines a connections to a SIP Provider or another SIP server.';
 	$text['description-gateway-edit']['pt-pt'] = '';
 
-	$text['label-gateway-name']['en-us'] = 'Gateway';
-	$text['label-gateway-name']['pt-pt'] = '';
+	$text['label-gateway']['en-us'] = 'Gateway';
+	$text['label-gateway']['pt-pt'] = '';
 
 	$text['description-gateway-name']['en-us'] = 'Enter the gateway name here.';
 	$text['description-gateway-name']['pt-pt'] = '';
diff --git a/app/gateways/gateway_edit.php b/app/gateways/gateway_edit.php
index f1cc2b4932..dc1c4460a3 100644
--- a/app/gateways/gateway_edit.php
+++ b/app/gateways/gateway_edit.php
@@ -86,7 +86,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 	//check for all required data
-		if (strlen($gateway_uuid) == 0) { $msg .= $text['message-required']." ".$text['label-gateway_uuid']."<br>\n"; }
 		//if (strlen($domain_uuid) == 0) { $msg .= $text['message-required']." ".$text['label-domain_uuid']."<br>\n"; }
 		if (strlen($gateway) == 0) { $msg .= $text['message-required']." ".$text['label-gateway']."<br>\n"; }
 		if ($register == "true") {
@@ -373,7 +372,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 	echo "<tr>\n";
 	echo "<td width=\"30%\" class='vncellreq' valign='top' align='left' nowrap>\n";
-	echo "    ".$text['label-gateway-name'].":\n";
+	echo "    ".$text['label-gateway'].":\n";
 	echo "</td>\n";
 	echo "<td width=\"70%\" class='vtable' align='left'>\n";
 	echo "    <input class='formfld' type='text' name='gateway' maxlength='255' value=\"$gateway\">\n";