[DO NOT MERGE] Bug 951352 - Retry the key name during the wizard flow