Removed requirement for organization only. Works fine with public accounts and typical usage.