User addresses fix