Check for an org in session before returning first org

cc @fancyremarker

This is used with the new context switcher