fix logic in enrollment workflow
fixes for enrollment workflow