Removed deprecation warning
Replaced registered_student with registered_student_or_on_team