Fixed remember me and locality issue