Improve user address to better account