With set_default_organization removed as a before filter, we need to fallback to it instead
Merge pull request #46 from sandersonet/current-organization-fix

Fix for broken org switcher