diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index d84fb6fa3cd1cc5dc9ed5357f606784ccebd4ca3..3992a7e758c1831655144924112f10a7e1335ffb 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -446,6 +446,10 @@ function web_admin_create_installed_apps {
                     else
                         domain_name=$(cat "/var/lib/tor/hidden_service_${app_name}/hostname")
                     fi
+                    onion_domain_name=
+                    if [ -f "/var/lib/tor/hidden_service_${app_name}/hostname" ]; then
+                        onion_domain_name="/var/lib/tor/hidden_service_${app_name}/hostname"
+                    fi
                     if [ "$domain_name" ]; then
                         if [[ "$domain_name" != *'.onion' ]]; then
                             domain_name="https://${!test_domain_name}"
@@ -480,6 +484,11 @@ function web_admin_create_installed_apps {
                     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"
+                    else
+                        sed -i "s|ONIONURL|${onion_domain_name}|g" "$filename"
+                    fi
                     sed -i "s|APPDESCRIPTION|${DESCRIPTION}|g" "$filename"
 
                     installed_apps_ctr=$((installed_apps_ctr+1))
diff --git a/webadmin/EN/app_template.html b/webadmin/EN/app_template.html
index 04834adb4fc5f985020e78ae254d0de70a6d7f8e..cad575fba454189091450051ff3365ee590c80ef 100644
--- a/webadmin/EN/app_template.html
+++ b/webadmin/EN/app_template.html
@@ -84,6 +84,7 @@
       <h1>APPNAME</h1>
       <p class="appdesc">APPDESCRIPTION</p>
       <p class="appurl"><a href="APPURL">APPURL</a></p>
+      <p class="appurl"><a href="ONIONURL">ONIONURL</a></p>
       <br>
       <form action="removeappconfirm.php" method="post">
         <input type="hidden" name="app_name" value="APPNAME">