ensure orgs exist before setting default
fix redundant self
Merge pull request #27 from sandersonet/default-org-fix

Default org fix