diff --git a/community-containers/lldap/lldap.json b/community-containers/lldap/lldap.json
index 3592f179..8f7fba88 100644
--- a/community-containers/lldap/lldap.json
+++ b/community-containers/lldap/lldap.json
@@ -27,6 +27,7 @@
         "LLDAP_JWT_SECRET",
         "LLDAP_LDAP_USER_PASS"
       ],
+      "ui_secret": "LLDAP_JWT_SECRET",
       "volumes": [
         {
           "source": "nextcloud_aio_lldap",
diff --git a/community-containers/nocodb/nocodb.json b/community-containers/nocodb/nocodb.json
index 8a915c2f..a5d56e13 100644
--- a/community-containers/nocodb/nocodb.json
+++ b/community-containers/nocodb/nocodb.json
@@ -28,6 +28,7 @@
                 "NOCODB_JWT_SECRET",
                 "NOCODB_USER_PASS"
             ],
+            "ui_secret": "NOCODB_USER_PASS",
             "volumes": [
                 {
                     "source": "nextcloud_aio_nocodb",
diff --git a/community-containers/nocodb/readme.md b/community-containers/nocodb/readme.md
index 8d528928..748c8585 100644
--- a/community-containers/nocodb/readme.md
+++ b/community-containers/nocodb/readme.md
@@ -17,7 +17,7 @@ This is an alternative of **Airtable**.
 - You need to configure a reverse proxy in order to run this container since nocodb needs a dedicated (sub)domain! For that, you might have a look at https://github.com/nextcloud/all-in-one/tree/main/community-containers/caddy.
 - Currently, only `tables.$NC_DOMAIN` is supported as subdomain! So if Nextcloud is using `your-domain.com`, nocodb will use `tables.your-domain.com`.
 - The data of NocoDb will be automatically included in AIOs backup solution!
-- After adding and starting the container, you need to run `docker inspect nextcloud-aio-nocodb  | grep NC_ADMIN_PASS` to obtain the system administrator password (username: `admin@noco.db`). With this information, you can log in to the web interface at `https://tables.$NC_DOMAIN/#/signin`
+- After adding and starting the container, you can log in to the web interface at `https://tables.$NC_DOMAIN/#/signin` with the username `admin@noco.db` and the password that you can see in the AIO interface next to the container. 
 - See https://docs.nocodb.com/ for usage of NocoDb
 - See https://github.com/nextcloud/all-in-one/tree/main/community-containers#community-containers how to add it to the AIO stack
 
diff --git a/community-containers/stalwart/stalwart.json b/community-containers/stalwart/stalwart.json
index 891bd9da..7858327c 100644
--- a/community-containers/stalwart/stalwart.json
+++ b/community-containers/stalwart/stalwart.json
@@ -53,6 +53,7 @@
             "secrets": [
                 "STALWART_USER_PASS"
             ],
+            "ui_secret": "STALWART_USER_PASS",
             "volumes": [
                 {
                     "source": "nextcloud_aio_stalwart",
diff --git a/php/templates/containers.twig b/php/templates/containers.twig
index 6f0128b3..a3de0b24 100644
--- a/php/templates/containers.twig
+++ b/php/templates/containers.twig
@@ -283,7 +283,7 @@
                                                 (<a href="{{ container.GetDocumentation() }}">docs</a>)
                                             {% endif %}
                                             {% if container.GetUiSecret() != '' %}
-                                                (secret: {{ GetUiSecret.GetUiSecret() }} )
+                                                (password: {{ GetUiSecret.GetUiSecret() }} )
                                             {% endif %}
                                             </span>
                                         {% elseif container.GetRunningState().value == 'running' %}
@@ -293,7 +293,7 @@
                                                 (<a href="{{ container.GetDocumentation() }}">docs</a>)
                                             {% endif %}
                                             {% if container.GetUiSecret() != '' %}
-                                                (secret: {{ GetUiSecret.GetUiSecret() }} )
+                                                (password: {{ GetUiSecret.GetUiSecret() }} )
                                             {% endif %}
                                             </span>
                                         {% else %}
@@ -303,7 +303,7 @@
                                                 (<a href="{{ container.GetDocumentation() }}">docs</a>)
                                             {% endif %}
                                             {% if container.GetUiSecret() != '' %}
-                                                (secret: {{ GetUiSecret.GetUiSecret() }} )
+                                                (password: {{ GetUiSecret.GetUiSecret() }} )
                                             {% endif %}
                                             </span>
                                         {% endif %}