Fix for user update bug

Method to set organisation id only proceeds if user is not currently
assigned to that org. Removes org_admin role.