Fixed logic when enrolling and un-enrolling