fix fall back redirect and  initial message