diff --git a/dns/ddclient/src/opnsense/mvc/app/controllers/OPNsense/DynDNS/forms/dialogAccount.xml b/dns/ddclient/src/opnsense/mvc/app/controllers/OPNsense/DynDNS/forms/dialogAccount.xml
index 28d40b7e4..b47b38dda 100644
--- a/dns/ddclient/src/opnsense/mvc/app/controllers/OPNsense/DynDNS/forms/dialogAccount.xml
+++ b/dns/ddclient/src/opnsense/mvc/app/controllers/OPNsense/DynDNS/forms/dialogAccount.xml
@@ -77,7 +77,7 @@
         <id>account.ttl</id>
         <label>TTL</label>
         <type>text</type>
-        <style>optional_setting service_aws service_netcup</style>
+        <style>optional_setting service_aws service_netcup service_gandi service_godaddy</style>
         <help>Time to Live for the DNS entry</help>
     </field>
     <field>
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 333d478a8..95e37f9c7 100644
--- a/dns/ddclient/src/opnsense/service/templates/OPNsense/ddclient/ddclient.conf
+++ b/dns/ddclient/src/opnsense/service/templates/OPNsense/ddclient/ddclient.conf
@@ -44,9 +44,10 @@ protocol={{account.service}}, \
 dynurl=https://ipv4.cloudns.net/api/dynamicURL/?q={{account.password}}, \
 {%      elif account.service == 'hosting1984' %}
 protocol=1984, \
-{%      elif account.service == 'godaddy' %}
+{%      elif account.service in ['godaddy', 'gandi'] %}
 protocol={{account.service}}, \
 zone={{account.zone}}, \
+ttl={{account.ttl}}, \
 {%      elif account.service == 'hetzner' %}
 protocol={{account.service}}, \
 zone={{account.zone}}, \
@@ -56,9 +57,6 @@ server=updates.dnsomatic.com, \
 {%      elif account.service == 'dynu' %}
 protocol=dyndns2, \
 server=api.dynu.com, \
-{%      elif account.service == 'gandi' %}
-protocol={{account.service}}, \
-zone={{account.zone}}, \
 {%      elif account.service == 'he-net' %}
 protocol=dyndns2, \
 server=dyn.dns.he.net, \