Fix the buttonrow showing up in the "is this your computer" and "verify your email" screens when closing the dialog.