Merge pull request #278 from crdlc/bug-1092105

Bug 1092105 - Every time the app is launched and the wizard is shown to ...(cherry picked from commit 8428c33624516fe212c6dc078e85e4101843258a)