'token' id defined twice on logged-out pages

Backport http://bzr.mozilla.org/bugzilla/4.2/revision/8196 to our
custom copy of template/en/default/account/auth/login-small.html.tmpl

Change-Id: Ibf1e8795f31e79594bac24710998116bb14de49e
Merge "'token' id defined twice on logged-out pages"