Fixed updates

TODO: fix new org add in new user modal