Fixing user session weirdness