updated rule of when to show the user the step-2 CC form

see https://github.com/GigaOM/legacy-pro/issues/4642