fix login and options regressions