diff --git a/src/controllers/session/login/index.js b/src/controllers/session/login/index.js
index 4c241389a0..144d865898 100644
--- a/src/controllers/session/login/index.js
+++ b/src/controllers/session/login/index.js
@@ -229,6 +229,12 @@ export default function (view, params) {
                 showManualForm(context, true);
             } else if (haspw == 'false') {
                 authenticateUserByName(context, getApiClient(), getTargetUrl(), name, '');
+                getApiClient().getPublicUsers().then((users) => {
+                    if (users.length >= 2) {
+                        // Disable RememberMe if multiple users exist and no password is used
+                        appSettings.enableAutoLogin(false);
+                    } 
+                });
             } else {
                 context.querySelector('#txtManualName').value = name;
                 context.querySelector('#txtManualPassword').value = '';
diff --git a/src/scripts/settings/appSettings.js b/src/scripts/settings/appSettings.js
index e10d6053d3..3d74028940 100644
--- a/src/scripts/settings/appSettings.js
+++ b/src/scripts/settings/appSettings.js
@@ -16,7 +16,7 @@ class AppSettings {
             this.set('enableAutoLogin', val.toString());
         }
 
-        return toBoolean(this.get('enableAutoLogin'), true);
+        return toBoolean(this.get('enableAutoLogin'), false);
     }
 
     /**