diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index 264716055511422314e5cb2ba7e0836d1e4b9415..05a412c5bcf3bb058ab84ec043db978d1e8010f1 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -52,7 +52,7 @@ function web_admin_create_add_apps {
     apps_add_template_filename="/var/www/${local_hostname}/htdocs/admin/apps_add_template.html"
     appslist_add_filename="/var/www/${local_hostname}/htdocs/admin/apps_add.html"
     icons_dir="/var/www/${local_hostname}/htdocs/admin/icons"
-    app_add_template_filename="app_add_template.html"
+    app_add_template_filename="/var/www/${local_hostname}/htdocs/admin/app_add_template.html"
     FILES="/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*"
 
     if [ ! -d "$icons_dir" ]; then
@@ -95,6 +95,7 @@ function web_admin_create_add_apps {
                     cp "$icon_filename" "/var/www/${local_hostname}/htdocs/admin/icons/${app_name}.png"
                 else
                     icon_filename=
+                    continue
                 fi
 
                 app_name_upper=$(echo "$app_name" | awk '{print toupper($0)}')
@@ -128,7 +129,7 @@ function web_admin_create_add_apps {
 
                 { echo '      <div class="column">';
                   echo '        <div>';
-                  echo "          <a href=\"app_${app_name}.html\">";
+                  echo "          <a href=\"app_add_${app_name}.html\">";
                   echo "            <img src=\"icons/${app_name}.png\" style=\"width:100%\">";
                   echo "            <center>${app_name}</center>";
                   echo '          </a>';
@@ -201,6 +202,7 @@ function web_admin_create_installed_apps {
                     cp "$icon_filename" "/var/www/${local_hostname}/htdocs/admin/icons/${app_name}.png"
                 else
                     icon_filename=
+                    continue
                 fi
 
                 app_name_upper=$(echo "$app_name" | awk '{print toupper($0)}')