// Early bail out conditions.
if (!isloggedin() || isguestuser() || user_not_fully_set_up($USER) ||
- get_user_preferences('auth_forcepasswordchange')) {
+ get_user_preferences('auth_forcepasswordchange') ||
+ (!$USER->policyagreed && $CFG->sitepolicy)) {
return '';
}