fixed and improved remember-me loving