Fix various issues with applications.

In particular fix broken process for replacing applicant with existing
user.

Change-Id: I1c27878eb01544383ed31becbb1bd7781132cd64
Don't save applicant unless we have to.

Change-Id: I1d31310334d039ef341a8fc4a909fd149c421f92