Usermanager bug fixes + wizard steps fix