Fixed remember-me feature