Fix tap() issue on the second next button when setting an account up
Merge pull request #376 from owdqa/feature/email_improvements

Fix tap() issue on the second next button when setting an account up