Adapt flow for new 'professional' mode.

ECOM-41