fix switcher/login/redirect stuff