fix guest flow