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