diff --git a/php/src/Controller/ConfigurationController.php b/php/src/Controller/ConfigurationController.php
index 61f22f27..e43a380f 100644
--- a/php/src/Controller/ConfigurationController.php
+++ b/php/src/Controller/ConfigurationController.php
@@ -25,6 +25,12 @@ class ConfigurationController
                 $this->configurationManager->SetDomain($request->getParsedBody()['domain']);
             }
 
+            if (isset($request->getParsedBody()['current-master-password']) || isset($request->getParsedBody()['new-master-password'])) {
+                $currentMasterPassword = $request->getParsedBody()['current-master-password'] ?? '';
+                $newMasterPassword = $request->getParsedBody()['new-master-password'] ?? '';
+                $this->configurationManager->ChangeMasterPassword($currentMasterPassword, $newMasterPassword);
+            }
+
             if (isset($request->getParsedBody()['borg_backup_host_location'])) {
                 $this->configurationManager->SetBorgBackupHostLocation($request->getParsedBody()['borg_backup_host_location']);
             }
diff --git a/php/src/Data/ConfigurationManager.php b/php/src/Data/ConfigurationManager.php
index f98cab2b..d4eab72f 100644
--- a/php/src/Data/ConfigurationManager.php
+++ b/php/src/Data/ConfigurationManager.php
@@ -236,6 +236,34 @@ class ConfigurationManager
         $this->WriteConfig($config);
     }
 
+    /**
+     * @throws InvalidSettingConfigurationException
+     */
+    public function ChangeMasterPassword(string $currentPassword, string $newPassword) : void {
+        if ($currentPassword === '') {
+            throw new InvalidSettingConfigurationException("Please enter your current password.");
+        }
+
+        if ($currentPassword !== $this->GetPassword()) {
+            throw new InvalidSettingConfigurationException("The entered current password is not correct.");
+        }
+
+        if ($newPassword === '') {
+            throw new InvalidSettingConfigurationException("Please enter a new password.");
+        }
+
+        if (strlen($newPassword) < 24) {
+            throw new InvalidSettingConfigurationException("New passwords must be >= 24 digits.");
+        }
+
+        if (!preg_match("#^[a-zA-Z0-9 ]+$#", $newPassword)) {
+            throw new InvalidSettingConfigurationException('Not allowed characters in the new password.');
+        }
+
+        // All checks pass so set the password
+        $this->SetPassword($newPassword);
+    }
+
     public function GetApachePort() : string {
         $port = getenv('APACHE_PORT');
         if ($port === false) {
diff --git a/php/templates/containers.twig b/php/templates/containers.twig
index 3875d266..bbaf8fb3 100644
--- a/php/templates/containers.twig
+++ b/php/templates/containers.twig
@@ -19,8 +19,6 @@
         <h1>Nextcloud AIO Beta v0.6.0</h1>
         This is beta software and not production ready.<br><br>
 
-        You are currently running the {{ current_channel }} channel.<br><br>
-
         {% set isAnyRunning = false %}
         {% set isWatchtowerRunning = false %}
         {% set isBackupContainerRunning = false %}
@@ -79,6 +77,7 @@
 
                 {% if isAnyRunning == true %}
                     {% if isApacheStarting != true %}
+                        Your initial Nextcloud credentials:<br><br />
                         Initial Nextcloud username: admin<br />
                         Initial Nextcloud password: {{ nextcloud_password }}<br /><br/>
                         <a href="https://{{ domain }}" class="button" target="_blank" rel="noopener">Open your Nextcloud ↗</a><br/>
@@ -161,31 +160,42 @@
                     {% endif %}
                 {% endif %}
 
-                {% if is_mastercontainer_update_available == true %}
-                    {% if isBackupOrRestoreRunning == false %}
-                        <h2>Mastercontainer update</h2>
-                        {% if isAnyRunning == false %}
-                            ⚠ A mastercontainer update is available. Please click on the button below to update it.<br><br>
-                            <form method="POST" action="/api/docker/watchtower" class="xhr">
-                                <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
-                                <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
-                                <input class="button" type="submit" value="Update mastercontainer" />
-                            </form>
-                        {% else %}
-                            ⚠ A mastercontainer update is available. Please stop your containers in order to be able to update the mastercontainer.<br><br>
-                        {% endif %}
-                        {% if current_channel starts with 'latest' %}
-                            You can find the changelog <a href="https://github.com/nextcloud/all-in-one/releases/latest">here</a><br><br>
-                        {% elseif current_channel starts with 'beta' %}
-                            You can find the changelog <a href="https://github.com/nextcloud/all-in-one/releases">here</a><br><br>
-                        {% elseif current_channel starts with 'develop' %}
-                            You can find all changes <a href="https://github.com/nextcloud-releases/all-in-one/commits/main">here</a><br><br>
-                        {% endif %}
-                    {% endif %}
-                {% endif %}
-
                 {% if was_start_button_clicked == true %}
                     
+                    {% if isBackupOrRestoreRunning == false %}
+                        <h2>Mastercontainer</h2>
+                        You are currently running the {{ current_channel }} channel.<br><br>
+
+                        {% if is_mastercontainer_update_available == true %}
+                            {% if isAnyRunning == false %}
+                                ⚠ A mastercontainer update is available. Please click on the button below to update it.<br><br>
+                                <form method="POST" action="/api/docker/watchtower" class="xhr">
+                                    <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
+                                    <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
+                                    <input class="button" type="submit" value="Update mastercontainer" />
+                                </form>
+                            {% else %}
+                                ⚠ A mastercontainer update is available. Please stop your containers in order to be able to update the mastercontainer.<br><br>
+                            {% endif %}
+                            {% if current_channel starts with 'latest' %}
+                                You can find the changelog <a href="https://github.com/nextcloud/all-in-one/releases/latest">here</a><br><br>
+                            {% elseif current_channel starts with 'beta' %}
+                                You can find the changelog <a href="https://github.com/nextcloud/all-in-one/releases">here</a><br><br>
+                            {% elseif current_channel starts with 'develop' %}
+                                You can find all changes <a href="https://github.com/nextcloud-releases/all-in-one/commits/main">here</a><br><br>
+                            {% endif %}
+                        {% endif %}
+
+                        You can change your AIO password below:<br><br />
+                        <form method="POST" action="/api/configuration" class="xhr">
+                            <input type="text" autocomplete="current-password" name="current-master-password" placeholder="your current aio password"/>
+                            <input type="text" autocomplete="new-password" name="new-master-password" placeholder="your new aio password"/>
+                            <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
+                            <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
+                            <input class="button" type="submit" value="Submit" />
+                        </form>
+                        The new password needs to be at least 24 characters long. Allowed characters are the <a href="https://en.wikipedia.org/wiki/Latin_alphabet#/media/File:Abecedarium.png">latin characters</a> 'a-z', 'A-Z', '0-9' and spaces.<br><br>
+                    {% endif %}
 
                     {% if isBackupOrRestoreRunning == false and borg_backup_host_location == "" and isApacheStarting != true %}
                         <h2>Backup and restore</h2>