diff --git a/php/templates/containers.twig b/php/templates/containers.twig
index 28542f98..7a078040 100644
--- a/php/templates/containers.twig
+++ b/php/templates/containers.twig
@@ -168,11 +168,17 @@
             {% if domain != "" %}
                 {% if isAnyRunning == true %}
                     {% if isApacheStarting != true %}
-                        <details>
-                        <summary>Click here to reveal the initial Nextcloud credentials</summary><br />
-                            Initial Nextcloud username: <b>admin</b><br />
-                            Initial Nextcloud password: <b>{{ nextcloud_password }}</b>
-                        </details><br /><br />
+                        {% if borg_backup_host_location != '' %}
+                            <details>
+                            <summary>Click here to reveal the initial Nextcloud credentials</summary><br />
+                        {% endif %}
+                                Initial Nextcloud username: <b>admin</b><br />
+                                Initial Nextcloud password: <b>{{ nextcloud_password }}</b>
+                        {% if borg_backup_host_location != '' %}
+                            </details><br /><br />
+                        {% else %}
+                            <br><br>
+                        {% endif %}
                         <a href="https://{{ domain }}" class="button" target="_blank" rel="noopener">Open your Nextcloud ↗</a><br/>
                     {% else %}
                         {% if isAnyRestarting == false %}
diff --git a/tests/QA/002-new-instance.md b/tests/QA/002-new-instance.md
index 3fea8359..3b2bf9c3 100644
--- a/tests/QA/002-new-instance.md
+++ b/tests/QA/002-new-instance.md
@@ -23,7 +23,7 @@ For the below to work, it is important that you have a domain that you point ont
     - [ ] Below that it should show a section with Containers: Apache, Database, Nextcloud and Redis and that your containers are up-to-date
     - [ ] On the bottom should be the Optional addons section shown but with disabled checkboxes (not clickable)
     - [ ] A automatic reload every 5s should happen until all Containers are started (as long as this window is focused)
-- [ ] After waiting a bit longer it should instead of the advice that your containers are currently running a details tag that is expandable with the initial Nextcloud credentials (username, password) and below that a button that allows to open the Nextcloud interface in a new tab
+- [ ] After waiting a bit longer it should instead of the advice that your containers are currently running show the initial Nextcloud credentials (username, password) and below that a button that allows to open the Nextcloud interface in a new tab
 - [ ] Clicking on that button should open the Nextcloud interface in a new tab and you should be able to log in using the provided credentials
 - [ ] Below the Containers section it should show a `Stop containers` button
 - [ ] Below the Containers section and above the Optional Addons section, you should see a Backup and restore section and an AIO password change section
diff --git a/tests/QA/004-initial-backup.md b/tests/QA/004-initial-backup.md
index 341a8b9a..0608f011 100644
--- a/tests/QA/004-initial-backup.md
+++ b/tests/QA/004-initial-backup.md
@@ -5,6 +5,7 @@
     - [ ] Enter `/mnt/` or  `/media/` or `/host_mnt/` or `/var/backups/` should send an error as well
     - [ ] Accepted should be `/mnt/backup`, `/media/backup`, `/host_mnt/c/backup` and `/var/backups`.
     - [ ] The side should now reload
+- [ ] The initial Nextcloud credentials on top of the page that are visible when the containers are running should now be hidden in a details tag
 - [ ] In the Backup restore section you should now see a Backup information section with important info like the encryption password, the backup location and more.
 - [ ] Also you should see a Backup cretion section that contains a `Create backup` button.
 - [ ] Clicking on the `Create backup` button should open a window prompt that allows to cancel the operation.