diff --git a/src/freedombone-utils-android b/src/freedombone-utils-android
index 2b89d96382fe4c9d389171b9bab57d210a03f145..ac886dc5e426b82d6cec334be9713d303147b285 100755
--- a/src/freedombone-utils-android
+++ b/src/freedombone-utils-android
@@ -34,10 +34,11 @@ function android_update_apps {
     local_hostname=$(grep 'host-name' /etc/avahi/avahi-daemon.conf | awk -F '=' '{print $2}').local
     plinth_api="/var/www/${local_hostname}/htdocs/plinth/api.json"
 
+    install_web_admin
+
     # Create a self-signed cert if needed
     # The FreedomBox app assumes a self-signed cert
     if [ ! -f "/etc/ssl/certs/${local_hostname}.crt" ]; then
-        install_web_admin
         fuser -k 80/tcp
         fuser -k 443/tcp
         systemctl restart nginx
diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index 9fcf3f639c77e8e5de3b363f55f956da29fceadd..0a317d6f0c05803c244a11051a63f9f79cbec17e 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -141,9 +141,8 @@ function web_admin_create_installed_apps {
 }
 
 function install_web_admin {
-    # TODO
-    # This is intended as a placeholder for a potential local web user interface
-    # similar to Plinth or the yunohost admin interface
+    # This is intended as an admin web user interface
+    # similar to Plinth or the yunohost
     local_hostname=$(grep 'host-name' /etc/avahi/avahi-daemon.conf | awk -F '=' '{print $2}').local
 
     if [ ! -d "/var/www/${local_hostname}/htdocs/admin" ]; then