diff --git a/php/templates/containers.twig b/php/templates/containers.twig
index 282db522..b7afe6b6 100644
--- a/php/templates/containers.twig
+++ b/php/templates/containers.twig
@@ -189,7 +189,7 @@
                 {% endif %}
             {% endif %}
 
-            {% if domain != "" and was_start_button_clicked == true %}
+            {% if was_start_button_clicked == true %}
                 {% if current_channel starts with 'latest' or current_channel starts with 'beta' or current_channel starts with 'develop' %}
                     You are running the <a href="https://github.com/nextcloud/all-in-one#how-to-switch-the-channel"><b>{{ current_channel }}</b></a> channel. (<a href="/api/docker/logs?id=nextcloud-aio-mastercontainer">Logs</a>)<br><br>
                 {% else %}
@@ -202,7 +202,7 @@
                 <a href="" class="button reload">Reload ↻</a><br/><br>
             {% endif %}
 
-            {% if domain != "" %}
+            {% if was_start_button_clicked == true %}
                 {% if isAnyRunning == true %}
                     {% if isApacheStarting != true %}
                         {% if borg_backup_host_location != '' %}
diff --git a/php/templates/includes/aio-config.twig b/php/templates/includes/aio-config.twig
index 7428fed8..9f415463 100644
--- a/php/templates/includes/aio-config.twig
+++ b/php/templates/includes/aio-config.twig
@@ -1,6 +1,6 @@
 <details>
     <summary>Click here to view the current AIO config and documentation links</summary><br />
-    {% if domain != '' %}
+    {% if was_start_button_clicked == true %}
         Nextclouds config.php file is stored in the nextcloud_aio_nextcloud Docker volume and can by edited by following the <a href="https://github.com/nextcloud/all-in-one#how-to-edit-nextclouds-configphp-file-with-a-texteditor">config.php documentation</a>.<br><br>
         You can run Nextcloud's usual occ commands by following the <a href="https://github.com/nextcloud/all-in-one#how-to-run-occ-commands">occ documentation</a></b>.<br><br>
     {% endif %}