diff --git a/auth/classes/output/login.php b/auth/classes/output/login.php
index 9ec9c329cbb..9876ea9b109 100644
--- a/auth/classes/output/login.php
+++ b/auth/classes/output/login.php
@@ -78,7 +78,7 @@ class login implements renderable, templatable {
      * @param string $username The username to display.
      */
     public function __construct(array $authsequence, $username = '') {
-        global $CFG, $SESSION;
+        global $CFG;
 
         $this->username = $username;
 
@@ -88,7 +88,7 @@ class login implements renderable, templatable {
         $this->cookieshelpicon = new help_icon('cookiesenabled', 'core');
 
         $this->autofocusform = !empty($CFG->loginpageautofocus);
-        $this->rememberusername = isset($CFG->rememberusername) and $CFG->rememberusername == 2;
+        $this->rememberusername = isset($CFG->rememberusername) && $CFG->rememberusername != 0;
 
         $this->forgotpasswordurl = new moodle_url('/login/forgot_password.php');
         $this->loginurl = new moodle_url('/login/index.php');
diff --git a/auth/tests/behat/login.feature b/auth/tests/behat/login.feature
index 697080011fa..f80390b204e 100644
--- a/auth/tests/behat/login.feature
+++ b/auth/tests/behat/login.feature
@@ -39,3 +39,18 @@ Feature: Authentication
     Given I log in as "admin"
     When I log out
     Then I should see "You are not logged in" in the "page-footer" "region"
+
+  Scenario Outline: Checking the display of the Remember username checkbox
+    Given I log in as "admin"
+    And I set the following administration settings values:
+      | rememberusername | <settingvalue> |
+    And I log out
+    And I am on homepage
+    When I click on "Log in" "link" in the ".logininfo" "css_element"
+    Then I should <expect> "Remember username"
+
+    Examples:
+      | settingvalue | expect  |
+      | 0            | not see |
+      | 1            | see     |
+      | 2            | see     |