Associate Customer with Users using Key instead the entity
Merging caused by unpushed code due to timeout issue