Fix adding users to org with a shitty hack... todo: not this