--- moodle2.2.1/login/index.php	2012-01-09 11:20:18.328544877 -0600
+++ moodle/login/index.php	2012-01-09 11:24:11.818543564 -0600
@@ -229,14 +229,16 @@
             $days2expire = $userauth->password_expire($USER->username);
             $PAGE->set_title("$site->fullname: $loginsite");
             $PAGE->set_heading("$site->fullname");
+            $buttonchangeyes = new single_button(new moodle_url($passwordchangeurl), get_string('yes'), 'post');
+            $buttonchangeno = new single_button(new moodle_url($urltogo), get_string('no'), 'post');
             if (intval($days2expire) > 0 && intval($days2expire) < intval($userauth->config->expiration_warning)) {
                 echo $OUTPUT->header();
-                echo $OUTPUT->confirm(get_string('auth_passwordwillexpire', 'auth', $days2expire), $passwordchangeurl, $urltogo);
+                echo $OUTPUT->confirm(get_string('auth_passwordwillexpire', 'auth', $days2expire), $buttonchangeyes, $buttonchangeno);
                 echo $OUTPUT->footer();
                 exit;
-            } elseif (intval($days2expire) < 0 ) {
+            } elseif (intval($days2expire) <= 0 ) {
                 echo $OUTPUT->header();
-                echo $OUTPUT->confirm(get_string('auth_passwordisexpired', 'auth'), $passwordchangeurl, $urltogo);
+                echo $OUTPUT->confirm(get_string('auth_passwordisexpired', 'auth'), $buttonchangeyes, $buttonchangeno);
                 echo $OUTPUT->footer();
                 exit;
             }