diff --git a/actions/dynamicdns b/actions/dynamicdns
index b9b145412..4b45a8c37 100755
--- a/actions/dynamicdns
+++ b/actions/dynamicdns
@@ -189,10 +189,10 @@ doReadCFG()
     ipurl=""
 
     if [ ! -z "${cfgfile}" ];then
-        host=$(grep host "${cfgfile}" 2> /dev/null |cut -d = -f 2)
-        server=$(grep server "${cfgfile}" 2> /dev/null |cut -d = -f 2 |grep -v ^\'\')
-        user=$(grep user "${cfgfile}" 2> /dev/null |cut -d = -f 2 |cut -d : -f 1 )
-        pass=$(grep user "${cfgfile}" 2> /dev/null |cut -d = -f 2 |cut -d : -f 2)
+        host=$(grep ^host= "${cfgfile}" 2> /dev/null | cut -d = -f 2-)
+        server=$(grep ^server= "${cfgfile}" 2> /dev/null | cut -d = -f 2- | grep -v ^\'\')
+        user=$(grep ^user= "${cfgfile}" 2> /dev/null | cut -d = -f 2- | cut -d : -f 1 )
+        pass=$(grep ^user= "${cfgfile}" 2> /dev/null | cut -d = -f 2- | cut -d : -f 2-)
     fi
 
     if [ ! -z ${HELPERCFG} ];then
@@ -338,7 +338,7 @@ case ${cmd} in
         doGetWANIP
         if [ "$(grep ^NAT ${HELPERCFG} | awk '{print $2}')" = "no" ];then
             #if we are not behind a NAT device and we use gnudip, start the daemon tool
-            local gnudipServer=$(grep server ${cfgfile} 2> /dev/null |cut -d = -f 2 |grep -v ^\'\')
+            local gnudipServer=$(grep ^server= ${cfgfile} 2> /dev/null | cut -d = -f 2- |grep -v ^\'\')
             if [ -f ${CFG} -a ! -z "${gnudipServer}" ];then
                 mv ${CFG_disabled} ${CFG}
                 /etc/init.d/${TOOLNAME} start