diff --git a/roles/base/templates/ddclient.conf.j2 b/roles/base/templates/ddclient.conf.j2
index 313d56c..8a543a3 100644
--- a/roles/base/templates/ddclient.conf.j2
+++ b/roles/base/templates/ddclient.conf.j2
@@ -10,8 +10,12 @@ verbose=no
 {% endif %}
 use=web, web={{ domain.web | default('dynamicdns.park-your-domain.com/getip')}}
 protocol={{ domain.protocol | default('namecheap')}}
-server={{ domain.server | default('dynamicdns.park-your-domain.com')}}
+{% if domain.server is defined %}
+server={{ domain.server }}
+{% endif %}
+{% if domain.name is defined %}
 login={{ domain.name }}
+{% endif %}
 password={{ domain.pass }}
 {{ domain.host }}