Do set cookie paramaters when using CLI
Do not set cookie params when in CLI
Merge commit '39027ff'