use iso8601 for cookie remember_me_until
fix merge conflict