diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js
index e5c86d769..23960a9ea 100644
--- a/client/components/main/layouts.js
+++ b/client/components/main/layouts.js
@@ -31,6 +31,11 @@ Template.userFormsLayout.onCreated(function() {
       return this.stop();
     },
   });
+  Meteor.call('isPasswordDisabled', (_, result) => {
+    if (result) {
+      $('.at-pwd-form').hide();
+    }
+  });
 });
 
 Template.userFormsLayout.onRendered(() => {
diff --git a/models/settings.js b/models/settings.js
index 0d671aa49..3bebd9779 100644
--- a/models/settings.js
+++ b/models/settings.js
@@ -334,6 +334,11 @@ if (Meteor.isServer) {
     getDefaultAuthenticationMethod() {
       return process.env.DEFAULT_AUTHENTICATION_METHOD;
     },
+
+    isPasswordDisabled() {
+      return process.env.PASSWORD_LOGIN_ENABLED === 'false';
+    },
+
   });
 }