KRACOEUS-7842:fixed issues with add wizard
Merge pull request #849 from jwillia/KRACOEUS_7842_2

KRACOEUS-7842:fixed issues with add wizard