diff --git a/dns/ddclient/src/opnsense/scripts/ddclient/lib/account/netcup.py b/dns/ddclient/src/opnsense/scripts/ddclient/lib/account/netcup.py
index 9bb775c1e..10322a630 100755
--- a/dns/ddclient/src/opnsense/scripts/ddclient/lib/account/netcup.py
+++ b/dns/ddclient/src/opnsense/scripts/ddclient/lib/account/netcup.py
@@ -64,7 +64,8 @@ class Netcup(BaseAccount):
                 syslog.syslog(syslog.LOG_ERR, "Incomplete FQDN offerred %s" % self.settings['hostnames'])
                 return False
 
-            self.hostname, self.domain = self.settings['hostnames'].split('.', 1)
+            self.domain = self.settings['hostnames'].split('.', self.settings['hostnames'].count('.')-1)[-1]
+            self.hostname = self.settings['hostnames'].rsplit('.', 2)[0] if self.domain != self.settings['hostnames'] else '@'
 
             if self.settings['password'].count('|') == 1:
                 self.settings['APIPassword'], self.settings['APIKey'] = self.settings['password'].split('|')