fix some issues with remember-me