Fix for anon user being set too late causing cookie warning
Merge