#14 refactor rememberMe