diff --git a/html/src/app.js b/html/src/app.js
index 43939976..a871ecd1 100644
--- a/html/src/app.js
+++ b/html/src/app.js
@@ -5971,38 +5971,7 @@ speechSynthesis.getVoices();
         }
         return new Promise((resolve, reject) => {
             if (this.enablePrimaryPassword) {
-                this.checkPrimaryPassword(loginParmas)
-                    .then((pwd) => {
-                        this.loginForm.loading = true;
-                        return API.getConfig()
-                            .catch((err) => {
-                                this.loginForm.loading = false;
-                                reject(err);
-                            })
-                            .then(() => {
-                                API.login({
-                                    username: loginParmas.username,
-                                    password: pwd,
-                                    cipher: loginParmas.password
-                                })
-                                    .catch((err2) => {
-                                        this.loginForm.loading = false;
-                                        API.logout();
-                                        reject(err2);
-                                    })
-                                    .then(() => {
-                                        this.loginForm.loading = false;
-                                        resolve();
-                                    });
-                            });
-                    })
-                    .catch((_) => {
-                        this.$message({
-                            message: 'Incorrect primary password',
-                            type: 'error'
-                        });
-                        reject(_);
-                    });
+                API.logout();
             } else {
                 API.getConfig()
                     .catch((err) => {
@@ -6017,11 +5986,9 @@ speechSynthesis.getVoices();
                             .catch((err2) => {
                                 this.loginForm.loading = false;
                                 API.logout();
-                                reject(err2);
                             })
                             .then(() => {
                                 this.loginForm.loading = false;
-                                resolve();
                             });
                     });
             }
diff --git a/html/src/index.pug b/html/src/index.pug
index 809c8637..f9eee155 100644
--- a/html/src/index.pug
+++ b/html/src/index.pug
@@ -1132,7 +1132,7 @@ html
                 div.options-container
                     span.header Application
                     div.options-container-item
-                        span.name Use a Primary Password
+                        span.name(style="min-width:236px") Encrypt password (disables auto login)
                         el-switch(v-model="enablePrimaryPassword" @change="enablePrimaryPasswordChange" :disabled="!loginForm.savedCredentials[API.currentUser.username]")
                     div.options-container-item
                         span.name Start at Windows startup