forms: Fix user creation if email is a drop-down

Previously, it was assumed that the user email field would be a text field
Merge remote-tracking branch 'upstream/pr/268' into develop

* upstream/pr/268:
  forms: Fix user creation if email is a drop-down