Should password field(s) come before email in account-creation form?

[root]

On at least one occasion, a new Psiphon user has (probably by reflex rather than due to an actual misunderstanding...) entered his Gmail password into the "Password" field of the account-creation form. This is because it appears immediately after the "E-mail address" field.

            We should determine the "standard" order for these fields and stick with it. I would guess that the "Password" and "Verify password" fields should come after the "Username" field and before the "E-mail address" field (especially where the email address is optional).