better naming
fix remember me feature