diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index 307e0c7006cec37189ac9d93a08ceb9c2a29f3ed..7b2d2b50c07bf5458114447387a5d737fd0272ed 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -483,11 +483,11 @@ function web_admin_create_installed_apps {
                     # Replace app variables
                     sed -i "s|HOSTNAME|$(hostname)|g" "$filename"
                     sed -i "s|APPNAME|${app_name}|g" "$filename"
-                    sed -i "s|APPURL|${domain_name}|g" "$filename"
-                    if [[ "$ONION_ONLY" == 'no' ]]; then
-                        sed -i '/ONIONURL/d' "$filename"
+                    sed -i "s|ONIONURL|http://${onion_domain_name}|g" "$filename"
+                    if [[ "$ONION_ONLY" != 'no' ]]; then
+                        sed -i '/APPURL/d' "$filename"
                     else
-                        sed -i "s|ONIONURL|${onion_domain_name}|g" "$filename"
+                        sed -i "s|APPURL|${domain_name}|g" "$filename"
                     fi
                     sed -i "s|APPDESCRIPTION|${DESCRIPTION}|g" "$filename"