Fix enrolment flow (remove enrolment guessing on PZH WI)

Jira issue: WP-955