Fixes #5847 speeds up user location upgrade