Merge: rev814 (update validate email page for u1)