Revert "Revert "Fix for SetupWizard""

WTF I reverted that commit?

This reverts commit f2991cb294ad9dee7c2217670822835cbb1ab2cc.