Make token field compatible with new login form

Other fields on the new login form wrap the input in a div. Do
that for token, too.

Change-Id: I22bc532a18f36a3a21fdee1b1b8076b3570e0515