diff --git a/src/usr/local/www/services_dyndns_edit.php b/src/usr/local/www/services_dyndns_edit.php
index 786fcee20f..18988bb11e 100644
--- a/src/usr/local/www/services_dyndns_edit.php
+++ b/src/usr/local/www/services_dyndns_edit.php
@@ -119,6 +119,9 @@ if ($_POST['save'] || $_POST['force']) {
 		} elseif (($pconfig['type'] == "linode") || ($pconfig['type'] == "linode-v6")) {
 			$host_to_check = $_POST['host'] == '@' ? $_POST['domainname'] : ( $_POST['host'] . '.' . $_POST['domainname'] );
 			$allow_wildcard = true;
+		} elseif (($pconfig['type'] == "route53") || ($pconfig['type'] == "route53-v6")) {
+			$host_to_check = $_POST['host'];
+			$allow_wildcard = true;
 		} else {
 			$host_to_check = $_POST['host'];
 
@@ -474,8 +477,6 @@ events.push(function() {
 				break;
 
 			case "dnsimple":
-			case "route53-v6":
-			case "route53":
 				hideGroupInput('domainname', true);
 				hideInput('resultmatch', true);
 				hideInput('updateurl', true);
@@ -489,6 +490,21 @@ events.push(function() {
 				hideInput('zoneid', false);
 				hideInput('ttl', false);
 				break;
+			case "route53-v6":
+			case "route53":
+				hideGroupInput('domainname', true);
+				hideInput('resultmatch', true);
+				hideInput('updateurl', true);
+				hideInput('requestif', true);
+				hideCheckbox('curl_ipresolve_v4', true);
+				hideCheckbox('curl_ssl_verifypeer', false);
+				hideInput('host', false);
+				hideInput('mx', true);
+				hideCheckbox('wildcard', true);
+				hideCheckbox('proxied', true);
+				hideInput('zoneid', false);
+				hideInput('ttl', false);
+				break;
 			case "namecheap":
 			case "gratisdns":
 			case "hover":