diff --git a/login/change_password.php b/login/change_password.php
index c8f1cbe9673..e56be2b0af6 100644
--- a/login/change_password.php
+++ b/login/change_password.php
@@ -11,7 +11,10 @@
         error('No such course!');
     }
 
-    if (empty($USER->preference['auth_forcepasswordchange'])) {  // Don't redirect if they just got sent here
+    // did we get here because of a force password change
+    $forcepassword = !empty($USER->preference['auth_forcepasswordchange']);
+
+    if (!$forcepassword) {  // Don't redirect if they just got sent here
         require_login($id);
     }
     
diff --git a/login/change_password_form.html b/login/change_password_form.html
index a42d29f9eab..8ef40970675 100644
--- a/login/change_password_form.html
+++ b/login/change_password_form.html
@@ -1,3 +1,10 @@
+
+<?php 
+    // only display this help message if we are being forced to change
+    if ($forcepassword) {
+        notify( get_string('forcepasswordchangenotice') );
+    }
+ ?>
 <p><b><?php print_string("allfieldsrequired") ?></b></p>
 <?php
    if (empty($frm->username)) {