Fix guestMasterUser not clearing properly