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 649ccc3fc..28b16314e 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
@@ -93,9 +93,9 @@
                     <Required>N</Required>
                     <ValidationMessage>A protocol type is required.</ValidationMessage>
                     <OptionValues>
-                        <dyndns1>DynDns1</dyndns1>
-                        <dyndns2>DynDns2</dyndns2>
-                        <post>custom POST</post>
+                        <dyndns1>DynDNS 1</dyndns1>
+                        <dyndns2>DynDNS 2</dyndns2>
+                        <post>Custom POST</post>
                     </OptionValues>
                 </protocol>
                 <server type="TextField">
diff --git a/dns/ddclient/src/opnsense/service/templates/OPNsense/ddclient/ddclient.json b/dns/ddclient/src/opnsense/service/templates/OPNsense/ddclient/ddclient.json
index 64e0ec7bc..79cf6fbbd 100644
--- a/dns/ddclient/src/opnsense/service/templates/OPNsense/ddclient/ddclient.json
+++ b/dns/ddclient/src/opnsense/service/templates/OPNsense/ddclient/ddclient.json
@@ -13,19 +13,19 @@
             "id": "{{ account['@uuid'] }}",
             "service": "{{ account.service }}",
             "protocol": "{{ account.protocol }}",
-            "server": "{{ account.server }}",
-            "resourceId": "{{ account.resourceId }}",
-            "username": "{{ account.username }}",
-            "password": "{{ account.password }}",
+            "server": {{ account.server | default('') | tojson }},
+            "resourceId": {{ account.resourceId | default('') | tojson }},
+            "username": {{ account.username | default('') | tojson }},
+            "password": {{ account.password | default('') | tojson }},
             "hostnames": "{{ account.hostnames }}",
             "wildcard": {{ "true" if account.wildcard == '1' else "false"}},
             "zone": "{{ account.zone }}",
             "checkip": "{{ account.checkip }}",
+            "interface": "{% if account.interface %}{{physical_interface(account.interface)}}{% endif %}",
             "checkip_timeout": {{ account.checkip_timeout }},
             "force_ssl": {{ "true" if account.force_ssl == '1' else "false"}},
             "ttl": "{{ account.ttl }}",
-            "interface": "{%if account.interface %}{{physical_interface(account.interface)}}{% endif%}",
-            "description": "{{ account.description }}"
+            "description": {{ account.description | default('') | tojson }}
         }{{ "," if not loop.last else ""}}
 {%   endfor %}
 {% endif %}