Fix problem with guest redirect