Improve the account linking UI a bit