Fix order of fields in SignUp form