Resort users after after upgrade