This *unreverts* 8751491b, which was mistakenly
reverted in !6328. It also changes the implementation of the
original commit to work with the new login styling and
markup.

cc: @ClemMakesApps