Registration improvements (multiple organizations)