diff --git a/lang/en/auth.php b/lang/en/auth.php
index 6d456637681..50d95921797 100644
--- a/lang/en/auth.php
+++ b/lang/en/auth.php
@@ -42,7 +42,7 @@ $string['auth_invalidnewemailkey'] = 'Error: if you are trying to confirm a chan
 $string['auth_multiplehosts'] = 'Multiple hosts OR addresses can be specified (eg host1.com;host2.com;host3.com) or (eg xxx.xxx.xxx.xxx;xxx.xxx.xxx.xxx)';
 $string['auth_notconfigured'] = 'The authentication method {$a} is not configured.';
 $string['auth_outofnewemailupdateattempts'] = 'You have run out of allowed attempts to update your email address. Your update request has been cancelled.';
-$string['auth_passwordisexpired'] = 'Your password has expired. Do you want to change your password now?';
+$string['auth_passwordisexpired'] = 'Your password has expired. Please change it now.';
 $string['auth_passwordwillexpire'] = 'Your password will expire in {$a} days. Do you want to change your password now?';
 $string['auth_remove_delete'] = 'Full delete internal';
 $string['auth_remove_keep'] = 'Keep internal';
diff --git a/login/index.php b/login/index.php
index 20d3a4761b9..e4612340cc9 100644
--- a/login/index.php
+++ b/login/index.php
@@ -233,6 +233,7 @@ if ($frm and isset($frm->username)) {                             // Login WITH
                 echo $OUTPUT->footer();
                 exit;
             } elseif (intval($days2expire) < 0 ) {
+                set_user_preference('auth_forcepasswordchange', 1, $USER);
                 echo $OUTPUT->header();
                 echo $OUTPUT->confirm(get_string('auth_passwordisexpired', 'auth'), $passwordchangeurl, $urltogo);
                 echo $OUTPUT->footer();