diff --git a/src/freedombone-installer b/src/freedombone-installer
index 07c1070b578ba53f28030c2a65b587191489442d..617920e8acdff94ac90dcea273c6a4ec513dbe84 100755
--- a/src/freedombone-installer
+++ b/src/freedombone-installer
@@ -1851,8 +1851,6 @@ function regenerate_dynamic_dns {
         sed -i "s|DDNS_USERNAME|$ddns_username|g" "$webadmin_install_dir/dynamicdns.html"
         sed -i "s|DDNS_CODE|$ddns_code|g" "$webadmin_install_dir/dynamicdns.html"
         sed -i "s|CURRENT_IP_ADDRESS|$(get_external_ipv4_address)|g" "$webadmin_install_dir/dynamicdns.html"
-        # Note: For security don't populate the password
-        #sed -i "s|DDNS_PASSWORD|$ddns_password|g" "$webadmin_install_dir/dynamicdns.html"
         chown www-data:www-data "$webadmin_install_dir/dynamicdns.html"
     fi
 }
@@ -2607,6 +2605,14 @@ function update_dynamic_dns {
             fi
 
             regenerate_dynamic_dns "$ddns" "$ddns_username" "$ddns_password" "$ddns_code"
+
+            if [[ "$ddns_code" == *'freedns'* ]]; then
+                if ! grep -q "/usr/local/bin/${PROJECT_NAME}-freedns" /etc/crontab; then
+                    echo "*/1            * *   *   *   root /usr/local/bin/${PROJECT_NAME}-freedns" >> /etc/crontab
+                fi
+            else
+                sed -i '/freedns/d' /etc/crontab
+            fi
         fi
 
         rm "$dynamic_dns_file"