Bug fix: Cookie expiration (Issue #665) redux