WP-4761 switch field order, phone first then email