Start bug where email is prepopulated

Follow up to I550a3e9350d477521d074ad5b49c82994ab9b473

On gateway initialization we setEmail(); but at step 1 no email
has been provided because it's a blank form. The previous change
would populate email with nobody@wm.o at this step.

In subsequent steps then, email would be something (nobody@wm.o),
therefore it would always look at the email GET/POST and never
emailAdd.

Now we're look at the old value first and populate from that.

Change-Id: I19ff4a9d5cb853ed49eb70db25dace5910a6e924
Merge "Start bug where email is prepopulated"