diff --git a/.dockerignore b/.dockerignore
index dd9674c9..d7aba841 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,6 @@
 releases/
 secrets/
 config/
-public/dist/build.js*
\ No newline at end of file
+public/dist/build.js*
+public/dist/
+public/node_modules/
\ No newline at end of file
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..530287e9
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Don't change line endings on .sh files
+*.sh -crlf
\ No newline at end of file
diff --git a/public/src/components/server_config/settings.vue b/public/src/components/server_config/settings.vue
index 1f17d2cd..4673237f 100644
--- a/public/src/components/server_config/settings.vue
+++ b/public/src/components/server_config/settings.vue
@@ -1,15 +1,18 @@
 <template>
     <collapsible :title="$t('title')" with-import="true" import-filename="settings.json" @load="setDataFile">
         <div class="pwd">
-            <field v-if="!passwordIsEmpty" type="password" :label="$t('password_label')" v-model="password" :disabled="passwordIsEmpty"></field>
+            <label v-if="!passwordIsEmpty"> {{ $t('password_label') }} </label>
+            <input v-if="!passwordIsEmpty" class="form-input" type="password" v-model="password" v-bind:autocomplete="'new-password'" :disabled="passwordIsEmpty">
             <checkbox :label="$t('password_empty_label')" v-model="passwordIsEmpty"></checkbox>
         </div>
         <div class="pwd">
-            <field v-if="!adminPasswordIsEmpty" type="password" :label="$t('adminpassword_label')" v-model="adminPassword" :disabled="adminPasswordIsEmpty"></field>
+            <label v-if="!adminPasswordIsEmpty"> {{ $t('adminpassword_label') }} </label>
+            <input v-if="!adminPasswordIsEmpty" class="form-input" type="password" v-model="adminPassword" v-bind:autocomplete="'new-password'" :disabled="adminPasswordIsEmpty">
             <checkbox :label="$t('adminpassword_empty_label')" v-model="adminPasswordIsEmpty"></checkbox>
         </div>
         <div class="pwd">
-            <field v-if="!spectatorPasswordIsEmpty" type="password" :label="$t('spectatorpassword_label')" v-model="spectatorPassword" :disabled="spectatorPasswordIsEmpty"></field>
+            <label v-if="!spectatorPasswordIsEmpty"> {{ $t('spectatorpassword_empty_label') }} </label>
+            <input v-if="!spectatorPasswordIsEmpty" class="form-input" type="password" v-model="spectatorPassword" v-bind:autocomplete="'new-password'" :disabled="spectatorPasswordIsEmpty">
             <checkbox :label="$t('spectatorpassword_empty_label')" v-model="spectatorPasswordIsEmpty"></checkbox>
         </div>
         <div class="server-settings-container three-columns" style="margin-top: 1.0rem;">