Updated user location handling