Making Guest entry more lenient