Fix issue with form auth for wizzard
Progress on settings screen