diff --git a/src/freedombone-addremove b/src/freedombone-addremove
index e671d8d801e1239d3c4a7dac81bcdfc0f28552ce..5cfeb9778abcd273b02abeac10e13c23e7744f02 100755
--- a/src/freedombone-addremove
+++ b/src/freedombone-addremove
@@ -337,7 +337,6 @@ if [ "$2" ]; then
     if [[ "$args" == "add" || "$args" == "remove" ]]; then
         app_name_upper=$(echo "$2" | awk '{print toupper($0)}')
         read_config_param "${app_name_upper}_DOMAIN_NAME"
-        read_config_param "${app_name_upper}_CODE"
         if [[ "$args" == "add" ]]; then
             select_specific_app "$2" "1"
         else
diff --git a/src/freedombone-installer b/src/freedombone-installer
index d222791e5787fb8201a5d035e4fbf1bbd65bc8fb..3d22406b4fa97f7e99071d39a02ee259c43385bf 100755
--- a/src/freedombone-installer
+++ b/src/freedombone-installer
@@ -1209,7 +1209,6 @@ function install_apps_from_webadmin {
                     app_domain=${app_name}.local
                 fi
                 app_name_upper=$(echo "$app_name" | awk '{print toupper($0)}')
-                freedns_code=$(echo -n "$linestr" | awk -F ',' '{print $3}')
 
                 # indicate that we are installing
                 sed -i "s|${app_name}|${app_name}_running|g" "$pending_installs"
@@ -1221,20 +1220,6 @@ function install_apps_from_webadmin {
                     sed -i "s|${app_name_upper}_DOMAIN_NAME=.*|${app_name_upper}_DOMAIN_NAME=${app_domain}|g" "$CONFIGURATION_FILE"
                 fi
 
-                if grep -q 'ONION_ONLY=no' "$CONFIGURATION_FILE"; then
-                    # Add freedns code to the config
-                    if [ "$freedns_code" ]; then
-                        # shellcheck disable=SC2086
-                        ${app_name_upper}_CODE="${freedns_code}"
-
-                        if ! grep -q "${app_name_upper}_CODE=" "$CONFIGURATION_FILE"; then
-                            echo "${app_name_upper}_CODE=${freedns_code}" >> "$CONFIGURATION_FILE"
-                        else
-                            sed -i "s|${app_name_upper}_CODE=.*|${app_name_upper}_CODE=${freedns_code}|g" "$CONFIGURATION_FILE"
-                        fi
-                    fi
-                fi
-
                 # remove app from the removed file
                 if grep -Fxq "_${app_name}_" "$REMOVED_APPS_FILE"; then
                     sed -i "/_${app_name}_/d" "$REMOVED_APPS_FILE"
@@ -1858,6 +1843,8 @@ function regenerate_dynamic_dns {
         cp "$webadmin_install_dir/dynamicdns_template.html" "$webadmin_install_dir/dynamicdns.html"
         if [[ "$ddns" == 'default@freedns.afraid.org' ]]; then
             ddns='freedns'
+        else
+            sed -i '/ddnscode/d' "$webadmin_install_dir/dynamicdns.html"
         fi
         if [[ "$ddns" == 'dyn.com' ]]; then
             ddns='dyn'
diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index 3f8c56b7221c517eaf1119ce6d4b880bdc78bfca..066f1cb1db41605c46db2315d3536ead8ce8d2c0 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -505,11 +505,11 @@ function web_admin_create_add_apps {
                                 fi
 
                                 # remove freedns if necessary
-                                if [[ "$DDNS_PROVIDER" != *"freedns"* ]]; then
-                                    if grep -q 'freedns_code' "$filename_app"; then
+                                #if [[ "$DDNS_PROVIDER" != *"freedns"* ]]; then
+                                #    if grep -q 'freedns_code' "$filename_app"; then
                                         sed -i '/freedns_code/d' "$filename_app"
-                                    fi
-                                fi
+                                #    fi
+                                #fi
 
                                 available_apps_ctr=$((available_apps_ctr+1))
 
@@ -1086,6 +1086,8 @@ function regenerate_webadmin_dynamic_dns {
         ddns="$DDNS_PROVIDER"
         if [[ "$ddns" == 'default@freedns.afraid.org' ]]; then
             ddns='freedns'
+        else
+            sed -i '/ddnscode/d' "$webadmin_install_dir/dynamicdns.html"
         fi
         if [[ "$ddns" == 'dyn.com' ]]; then
             ddns='dyn'
diff --git a/webadmin/EN/add_app_confirm_template.html b/webadmin/EN/add_app_confirm_template.html
index 98e160c237c1e4c2c4fd65d0117364edfda91c60..4a67da6f988f3289c044d7cd572b38cd56778f70 100644
--- a/webadmin/EN/add_app_confirm_template.html
+++ b/webadmin/EN/add_app_confirm_template.html
@@ -130,7 +130,6 @@
             <input type="radio" name="installconfirm" value="1"><label translate="yes">Yes</label>
             <input type="hidden" name="app_name" value="APPNAME">
             <input type="hidden" name="install_domain" value="APPDOMAIN">
-            <input type="hidden" name="freedns_code" value="APPCODE">
             <input type="hidden" name="no_domain" value="NODOMAIN">
           </p>
           <br><br>
diff --git a/webadmin/installapp.php b/webadmin/installapp.php
index b6db165921e6c19c5bfe100cbc28cab7b47d6bcb..0667e2a054dbb78ecae5ad4ac1b57f9ba67497af 100755
--- a/webadmin/installapp.php
+++ b/webadmin/installapp.php
@@ -26,7 +26,6 @@ if (isset($_POST['submitappinstall'])) {
                 // No domain was provided
                 $continue_install=false;
             }
-            $freedns_code = htmlspecialchars($_POST['freedns_code']);
         }
     }
 
@@ -36,7 +35,6 @@ if (isset($_POST['submitappinstall'])) {
         if(file_exists("add_app_confirm.html")) {
             exec('sed -i "s|APPNAME|'.$app_name.'|g" add_app_confirm.html');
             exec('sed -i "s|APPDOMAIN|'.$install_domain.'|g" add_app_confirm.html');
-            exec('sed -i "s|APPCODE|'.$freedns_code.'|g" add_app_confirm.html');
             exec('sed -i "s|NODOMAIN|'.$no_domain.'|g" add_app_confirm.html');
             $output_filename = "add_app_confirm.html";
         }
diff --git a/webadmin/installappconfirm.php b/webadmin/installappconfirm.php
index d862643e2ee420f7f5650a773892a83ab5c9b733..f316f8086315525d59561056c10545698b6ade77 100755
--- a/webadmin/installappconfirm.php
+++ b/webadmin/installappconfirm.php
@@ -31,7 +31,6 @@ if (isset($_POST['installconfirmsubmit'])) {
                         // No domain was provided
                         $continue_install=false;
                     }
-                    $freedns_code = htmlspecialchars($_POST['freedns_code']);
                 }
             }