fixing user authentication, organization list