Fixed logic for admin and user enrollment