Fix payment and user entity to relate properly