Move email and password fields.

Closes #35