diff --git a/server/router/visitroute/controller.go b/server/router/visitroute/controller.go
index bc1b8b6..63c6610 100644
--- a/server/router/visitroute/controller.go
+++ b/server/router/visitroute/controller.go
@@ -91,6 +91,10 @@ func (c *controller) handleRide(ctx echo.Context) error {
 	}
 	ride.Visit.Provider = provider
 
+	// user, err := c.svc.Users.GetByUUID(ride.User.ID, "US")
+	// if err != nil {
+	// 	return routeutils.HandleAPIError(ctx, err)
+	// }
 	user, err := c.svc.Users.CheckAndCreateMember(ride.Visit.User, provider, authUser)
 	if err != nil {
 		if validationError, ok := err.(*viewmodel.ValidationError); ok {
@@ -105,6 +109,7 @@ func (c *controller) handleRide(ctx echo.Context) error {
 	}
 	ride.Visit.User = user
 	ride.User = user
+	visit.User = user
 
 	homeAddress := viewmodel.Address{}
 	for _, a := range visit.User.Addresses {
@@ -133,9 +138,9 @@ func (c *controller) handleRide(ctx echo.Context) error {
 	}
 
 	ride.Notes = ride.Notes
-	ride.Passenger.FirstName = visit.User.First
+	ride.Passenger.FirstName = ride.Visit.User.First
 	ride.Passenger.LastName = " "
-	ride.Passenger.PhoneNumber = *visit.User.PhoneNumber
+	ride.Passenger.PhoneNumber = *ride.Visit.User.PhoneNumber
 	ride.RideType = "lyft"
 	ride.VisitDate = &visit.VisitDatetime
 	ride.VisitTime = &visit.VisitDatetime