Fix redirect and email update