diff --git a/src/restore.html b/src/restore.html
index b2c0ebf78..5f19e072b 100644
--- a/src/restore.html
+++ b/src/restore.html
@@ -121,13 +121,13 @@
                                 <!-- CIFS -->
                                 <div class="form-group" ng-show="provider === 'cifs'">
                                     <label class="control-label" for="configureBackupUsername">Username ({{ provider }})</label>
-                                    <input type="text" class="form-control" ng-model="mountOptions.username" id="configureBackupUsername" name="username" ng-disabled="busy">
+                                    <input type="text" class="form-control" ng-model="mountOptions.username" id="configureBackupUsername" name="cifsUsername" ng-disabled="busy">
                                 </div>
 
                                 <!-- CIFS -->
                                 <div class="form-group" ng-show="provider === 'cifs'">
                                     <label class="control-label" for="configureBackupPassword">Password ({{ provider }})</label>
-                                    <input type="password" class="form-control" ng-model="mountOptions.password" id="configureBackupPassword" name="password" ng-disabled="busy" password-reveal>
+                                    <input type="password" class="form-control" ng-model="mountOptions.password" id="configureBackupPassword" name="cifsPassword" ng-disabled="busy" password-reveal>
                                 </div>
 
                                 <!-- EXT4 -->
diff --git a/src/views/backups.html b/src/views/backups.html
index 34ba6370b..0943a002a 100644
--- a/src/views/backups.html
+++ b/src/views/backups.html
@@ -159,13 +159,13 @@
           <!-- CIFS -->
           <div class="form-group" ng-show="configureBackup.provider === 'cifs'">
             <label class="control-label" for="configureBackupUsername">{{ 'backups.configureBackupStorage.username' | tr }} ({{ configureBackup.provider }})</label>
-            <input type="text" class="form-control" ng-model="configureBackup.mountOptions.username" id="configureBackupUsername" name="username" ng-disabled="configureBackup.busy">
+            <input type="text" class="form-control" ng-model="configureBackup.mountOptions.username" id="configureBackupUsername" name="cifsUsername" ng-disabled="configureBackup.busy">
           </div>
 
           <!-- CIFS -->
           <div class="form-group" ng-show="configureBackup.provider === 'cifs'">
             <label class="control-label" for="configureBackupPassword">{{ 'backups.configureBackupStorage.password' | tr }} ({{ configureBackup.provider }})</label>
-            <input type="password" class="form-control" ng-model="configureBackup.mountOptions.password" id="configureBackupPassword" name="password" ng-disabled="configureBackup.busy" password-reveal>
+            <input type="password" class="form-control" ng-model="configureBackup.mountOptions.password" id="configureBackupPassword" name="cifsPassword" ng-disabled="configureBackup.busy" password-reveal>
           </div>
 
           <!-- EXT4 -->
@@ -318,10 +318,10 @@
           <div class="form-group" ng-class="{ 'has-error': configureBackup.error.password }" ng-show="configureBackup.provider !== 'noop'">
             <label class="control-label" for="inputConfigureBackupPassword">{{ 'backups.configureBackupStorage.encryptionPassword' | tr }} <sup><a ng-href="https://docs.cloudron.io/backups/#encryption" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
             <p class="small">{{ 'backups.configureBackupStorage.encryptionDescription' | tr }}</p>
-            <input type="text" class="form-control" name="password" ng-model="configureBackup.password" id="inputConfigureBackupPassword" ng-disabled="configureBackup.busy" placeholder="{{ 'backups.configureBackupStorage.encryptionPasswordPlaceholder' | tr }}">
+            <input type="text" class="form-control" name="encryptionPassword" ng-model="configureBackup.password" id="inputConfigureBackupPassword" ng-disabled="configureBackup.busy" placeholder="{{ 'backups.configureBackupStorage.encryptionPasswordPlaceholder' | tr }}">
           </div>
 
-          <div class="form-group" ng-show="configureBackup.password && configureBackup.password !== SECRET_PLACEHOLDER" ng-class="{ 'has-error': (configureBackupForm.password.$dirty && configureBackup.password !== configureBackup.passwordRepeat) }">
+          <div class="form-group" ng-show="configureBackup.password && configureBackup.password !== SECRET_PLACEHOLDER" ng-class="{ 'has-error': (configureBackupForm.encryptionPassword.$dirty && configureBackup.password !== configureBackup.passwordRepeat) }">
             <label class="control-label" for="inputConfigureBackupPasswordRepeat">{{ 'backups.configureBackupStorage.encryptionPasswordRepeat' | tr }}</label>
             <input id="inputConfigureBackupPasswordRepeat" type="text" class="form-control" name="passwordRepeat" ng-model="configureBackup.passwordRepeat" ng-disabled="configureBackup.busy">
           </div>
diff --git a/src/views/settings.html b/src/views/settings.html
index 019ee2d5d..a58d648a8 100644
--- a/src/views/settings.html
+++ b/src/views/settings.html
@@ -114,17 +114,17 @@
 
                   <div class="form-group">
                     <label class="control-label" for="registryConfigUsername">{{ 'settings.privateDockerRegistry.username' | tr }}</label>
-                    <input type="text" class="form-control" ng-model="registryConfig.username" id="registryConfigUsername" name="username" ng-disabled="registryConfig.busy" ng-required>
+                    <input type="text" class="form-control" ng-model="registryConfig.username" id="registryConfigUsername" name="registryUsername" ng-disabled="registryConfig.busy" ng-required>
                   </div>
 
                   <div class="form-group">
                     <label class="control-label" for="registryConfigEmail">{{ 'settings.privateDockerRegistryDialog.email' | tr }}</label>
-                    <input type="text" class="form-control" ng-model="registryConfig.email" id="registryConfigEmail" name="email" ng-disabled="registryConfig.busy">
+                    <input type="text" class="form-control" ng-model="registryConfig.email" id="registryConfigEmail" name="registryEmail" ng-disabled="registryConfig.busy">
                   </div>
 
                   <div class="form-group">
                     <label class="control-label" for="registryConfigPassword">{{ 'settings.privateDockerRegistryDialog.passwordToken' | tr }}</label>
-                    <input type="password" class="form-control" ng-model="registryConfig.password" id="registryConfigPassword" name="password" ng-disabled="registryConfig.busy" ng-required password-reveal>
+                    <input type="password" class="form-control" ng-model="registryConfig.password" id="registryConfigPassword" name="registryPassword" ng-disabled="registryConfig.busy" ng-required password-reveal>
                   </div>
                 </fieldset>
               </form>
diff --git a/src/views/volumes.html b/src/views/volumes.html
index 83678a9f3..a3c9a32fb 100644
--- a/src/views/volumes.html
+++ b/src/views/volumes.html
@@ -62,12 +62,12 @@
 
               <div class="form-group" ng-show="volumeAdd.mountType === 'cifs'">
                 <label class="control-label" for="volumeAddUsername">{{ 'volumes.addVolumeDialog.username' | tr }}</label>
-                <input type="text" class="form-control" ng-model="volumeAdd.username" id="volumeAddUsername" name="username" ng-disabled="volumeAdd.busy">
+                <input type="text" class="form-control" ng-model="volumeAdd.username" id="volumeAddUsername" name="cifsUsername" ng-disabled="volumeAdd.busy">
               </div>
 
               <div class="form-group" ng-show="volumeAdd.mountType === 'cifs'">
                 <label class="control-label" for="volumeAddPassword">{{ 'volumes.addVolumeDialog.password' | tr }}</label>
-                <input type="password" class="form-control" ng-model="volumeAdd.password" id="volumeAddPassword" name="password" ng-disabled="volumeAdd.busy" password-reveal>
+                <input type="password" class="form-control" ng-model="volumeAdd.password" id="volumeAddPassword" name="cifsPassword" ng-disabled="volumeAdd.busy" password-reveal>
               </div>
 
               <div class="form-group" ng-show="volumeAdd.mountType === 'sshfs'">