diff --git a/src/freedombone-app-edith b/src/freedombone-app-edith
index 9f26dfc8..3ea51993 100755
--- a/src/freedombone-app-edith
+++ b/src/freedombone-app-edith
@@ -266,7 +266,6 @@ function install_edith {
         fi
     fi
 
-
     if [ -d /var/www/$EDITH_DOMAIN_NAME/htdocs ]; then
         rm -rf /var/www/$EDITH_DOMAIN_NAME/htdocs
     fi
diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index 3094551f..a7aab073 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -174,6 +174,15 @@ function get_app_icann_address {
     if grep -q "${app_name} domain" $COMPLETION_FILE; then
         echo $(cat ${COMPLETION_FILE} | grep "${app_name} domain" | head -n 1 | awk -F ':' '{print $2}')
         return
+    else
+        app_name_upper=$(echo "$app_name" | tr '[:lower:]' '[:upper:]')_DOMAIN_NAME
+        if [ $app_name_upper ]; then
+            param_value=$(cat $CONFIGURATION_FILE | grep "${app_name_upper}=" | head -n 1 | awk -F '=' '{print $2}')
+            if [ ${param_value} ]; then
+                echo ${param_value}
+                return
+            fi
+        fi
     fi
     echo "${DEFAULT_DOMAIN_NAME}"
 }