Rework contact request to use new customer component