diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index ace96082e440005a880d127fab9b853dd7c6a46e..6654e79260cfd3d379b945c6a2b0f865187d7b5b 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -210,6 +210,7 @@ function web_admin_create_add_apps {
                 cp "$app_add_template_filename" "$filename"
 
                 # Replace app variables
+                sed -i "s|HOSTNAME|$(hostname)|g" "$filename"
                 sed -i "s|APPNAME|${app_name}|g" "$filename"
                 sed -i "s|APPDESCRIPTION|${DESCRIPTION}|g" "$filename"
 
diff --git a/webadmin/app_add_template.html b/webadmin/app_add_template.html
index 82ca440c12ee10a7909f9702edd4238553d43ff7..d329f1f603ad89500b9070ae3b623799c6c28139 100644
--- a/webadmin/app_add_template.html
+++ b/webadmin/app_add_template.html
@@ -96,7 +96,7 @@
       <p class="appdesc">APPDESCRIPTION</p>
 
       <form action="installapp.php" method="post">
-        <p><label>Domain:</label><input type="text" name="install_domain"></p>
+        <p><label>Domain:</label><input type="text" name="install_domain" value="APPNAME.HOSTNAME"></p>
         <p><label><a href="https://freedns.afraid.org/dynamic">FreeDNS code</a>:</label><input type="text" name="freedns_code"></p>
         <input type="hidden" name="app_name" value="APPNAME">
         <input type="submit" name="install" value="Install">