Upgrade to new ui_navigate where arg is always required

* Also workaround for strange force logout bug