CRAFTERCMS-356, CRAFTERCMS-357: Code enhancement. Security cookie issue ...

...managed