diff --git a/ui/public/i18n/en/translation.json b/ui/public/i18n/en/translation.json
index 3aaa9d7..49a0987 100644
--- a/ui/public/i18n/en/translation.json
+++ b/ui/public/i18n/en/translation.json
@@ -33,7 +33,7 @@
     "configuring": "Configuration in progress...",
     "lets_encrypt": "Let's Encrypt certificate",
     "domain": "User domain",
-    "no_domain": "No user domain",
+    "no_user_domain": "Nextcloud internal user database",
     "host_string_gte": "The host name can't be empty",
     "configure_nextcloud": "Configure Nextcloud",
     "host_invalid_type": "Invalid host name",
@@ -42,9 +42,9 @@
     "tls_verify_collabora":"Verify TLS certificate",
     "collabora_placeholder": "Select a collabora server or leave empty to disable",
     "admin_password": "Password for user 'admin'",
-    "domain_tooltip": "A user domain is used to authenticate users. If none user domain is listed you probably need to install one",
     "choose_ldap_domain": "Select a user domain",
-    "host_placeholder": "E.g. mynextcloud.example.org"
+    "host_placeholder": "E.g. mynextcloud.example.org",
+    "admin_password_tooltip": "The user 'admin' is the internal administrator of Nextcloud. This password is used to authenticate the 'admin' user in the Nextcloud web interface."
   },
   "about": {
     "title": "About"
diff --git a/ui/src/views/Settings.vue b/ui/src/views/Settings.vue
index 93a5593..b2593ea 100644
--- a/ui/src/views/Settings.vue
+++ b/ui/src/views/Settings.vue
@@ -39,8 +39,9 @@
               ref="host"
             >
             </cv-text-input>
-            <cv-text-input
+             <NsTextInput
               :label="$t('settings.admin_password')"
+              type="password"
               v-model.trim="password"
               v-if="!installed"
               class="mg-bottom"
@@ -48,7 +49,12 @@
               :disabled="loadingUi"
               ref="password"
             >
-            </cv-text-input>
+              <template slot="tooltip">
+                <span
+                  v-html="$t('settings.admin_password_tooltip')"
+                ></span>
+              </template>
+            </NsTextInput>
             <cv-toggle
               value="letsEncrypt"
               :label="$t('settings.lets_encrypt')"
@@ -76,11 +82,6 @@
               tooltipDirection="top"
               ref="domain"
             >
-            <template slot="tooltip">
-                {{
-                  $t("settings.domain_tooltip")
-                }}
-                </template>
             </NsComboBox>
             <template v-if="is_collabora && installed">
               <NsComboBox
@@ -309,6 +310,12 @@ export default {
         this.focusElement("domain");
         isValidationOk = false;
       }
+      if (!this.password) {
+        // test field cannot be empty
+        this.error.password = this.$t("common.required");
+        this.focusElement("password");
+        isValidationOk = false;
+      }
       // exclude characters not correctly supported by env file
       const re = new RegExp("\"|=|'|\\s|\\t");
       if (re.test(this.password)) {
@@ -358,7 +365,7 @@ export default {
           data: {
             host: this.host,
             lets_encrypt: this.isLetsEncryptEnabled,
-            domain: this.domain,
+            domain: this.domain === "-" ? "" : this.domain,
             is_collabora: this.is_collabora,
             collabora_host: this.collabora_host,
             tls_verify_collabora: this.tls_verify_collabora,
@@ -396,7 +403,7 @@ export default {
       this.collabora_host = config.collabora_host;
       this.collabora_URL = config.array_collabora;
       this.loading.getConfiguration = false;
-      this.domain = config.domain;
+      this.domain = config.domain === "" ? "-" : config.domain;
       this.focusElement("host");
     },
     listUserDomainsCompleted(taskContext, taskResult) {
@@ -410,6 +417,12 @@ export default {
         };
         this.domains.push(option);
       });
+      //PUSH no domain option
+      this.domains.unshift({
+        name: "no_user_domain",
+        label: this.$t("settings.no_user_domain"),
+        value: "-"
+      });
       this.loading.listUserDomains = false;
     },
     saveSettingsCompleted() {