diff --git a/client/components/main/layouts.css b/client/components/main/layouts.css
index 3d095ac6a..29e9e5bc2 100644
--- a/client/components/main/layouts.css
+++ b/client/components/main/layouts.css
@@ -639,3 +639,7 @@ a:not(.disabled).is-active i.fa {
     transform: rotate(360deg);
   }
 }
+
+.at-pwd-form {
+  display: none;
+}
\ No newline at end of file
diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js
index 2b140e0e4..7ab28966b 100644
--- a/client/components/main/layouts.js
+++ b/client/components/main/layouts.js
@@ -45,9 +45,9 @@ Template.userFormsLayout.onCreated(function () {
       return this.stop();
     },
   });
-  Meteor.call('isPasswordLoginDisabled', (_, result) => {
+  Meteor.call('isPasswordLoginEnabled', (_, result) => {
     if (result) {
-      $('.at-pwd-form').hide();
+      $('.at-pwd-form').show();
     }
   });
 
diff --git a/config/accounts.js b/config/accounts.js
index e256a8039..07cb99321 100644
--- a/config/accounts.js
+++ b/config/accounts.js
@@ -4,7 +4,7 @@ const passwordField = AccountsTemplates.removeField('password');
 const emailField = AccountsTemplates.removeField('email');
 let disableRegistration = false;
 let disableForgotPassword = false;
-let passwordLoginDisabled = false;
+let passwordLoginEnabled = false;
 let oidcRedirectionEnabled = false;
 let oauthServerUrl = "home";
 let oauthDashboardUrl = "";
@@ -16,11 +16,9 @@ Meteor.call('isOidcRedirectionEnabled', (_, result) => {
   }
 });
 
-Meteor.call('isPasswordLoginDisabled', (_, result) => {
+Meteor.call('isPasswordLoginEnabled', (_, result) => {
   if (result) {
-    passwordLoginDisabled = true;
-    //console.log('passwordLoginDisabled');
-    //console.log(result);
+    passwordLoginEnabled = true;
   }
 });
 
diff --git a/models/settings.js b/models/settings.js
index e7138f99e..c3f6b00d6 100644
--- a/models/settings.js
+++ b/models/settings.js
@@ -521,8 +521,8 @@ if (Meteor.isServer) {
       return process.env.DEFAULT_AUTHENTICATION_METHOD;
     },
 
-    isPasswordLoginDisabled() {
-      return process.env.PASSWORD_LOGIN_ENABLED === 'false';
+    isPasswordLoginEnabled() {
+      return !(process.env.PASSWORD_LOGIN_ENABLED === 'false');
     },
     isOidcRedirectionEnabled(){
       return process.env.OIDC_REDIRECTION_ENABLED === 'true' && Object.keys(loadOidcConfig("oidc")).length > 0;