Updated code to implement persistence of Location for non vendor users