Feature 3737 fix user loc toggle