email resend and redirect bugs fixed
merge