Fix a different type of login cancelling. Fixes #1660