Avoid showing error popup if user clicks Yes in registration popup

This is the first half of pull request #49