Issue #22 fixed redirect bug on guest-only instances