Merge pull request #812 from maykinmedia/bb-1634

Bb 1634
There were still some issues with setCookie, not all variables were correctly renamed