Made handling for organizational profile updating better