Add user account fields back onto new user form.

Fixes #210

Change-Id: I629e823cb6f0cf02366f0497417eef8324ae328a