MARI-68 updated to set cookies properly