diff --git a/dns/ddclient/src/opnsense/mvc/app/models/OPNsense/DynDNS/DynDNS.xml b/dns/ddclient/src/opnsense/mvc/app/models/OPNsense/DynDNS/DynDNS.xml
index e9bf53869..c5521211f 100644
--- a/dns/ddclient/src/opnsense/mvc/app/models/OPNsense/DynDNS/DynDNS.xml
+++ b/dns/ddclient/src/opnsense/mvc/app/models/OPNsense/DynDNS/DynDNS.xml
@@ -68,7 +68,7 @@
                     </OptionValues>
                 </service>
                 <username type="TextField">
-                    <Required>Y</Required>
+                    <Required>N</Required>
                     <mask>/^([a-z0-9\-.@_:+])*$/u</mask>
                     <ValidationMessage>The username contains invalid characters.</ValidationMessage>
                 </username>
diff --git a/dns/ddclient/src/opnsense/service/templates/OPNsense/ddclient/ddclient.conf b/dns/ddclient/src/opnsense/service/templates/OPNsense/ddclient/ddclient.conf
index 83ddb549d..a39586583 100644
--- a/dns/ddclient/src/opnsense/service/templates/OPNsense/ddclient/ddclient.conf
+++ b/dns/ddclient/src/opnsense/service/templates/OPNsense/ddclient/ddclient.conf
@@ -60,8 +60,10 @@ ssl=yes
 {%            endif %}
 {%            if account.wildcard|default('0') == '1' %}
 wildcard=yes
-{%            endif}
+{%            endif %}
+{%            if account.username %}
 login={{account.username}}
+{%            endif %}
 password={{account.password}}
 {{account.hostnames}}