Modified isEnrolled check in register/enroll