more guest user bugs fixed