How to solve authentication issues with Sourcetree 3.3.4?

[neualex]

Couple issues running latest Sourcetree 3.3.4 with BitBucket Cloud, see details below.

1. We recently subscribed to Atlassian Access to enforce 2FA.
Now, Sourcetree throws error below when pulling changes, see screenshot below.

remote: Too many invalid password attempts. Log in at https://id.atlassian.com/ to restore access

To quickly fix this error, we have to refresh our OAuth token (Tools > Options > Authentication > Accounts), see "oauth-token-account.png" attached.

Is there a better way to handle 2FA-enforced authentication in Sourcetree with BitBucket so we do not have to keep refreshing our OAuth token so often?

This issue occurs from time to time during the day or if we close and reopen Sourcetree.

2. When we need to create a Pull Request, there is an error sign on the Remote icon, see screenshot below, because the Generic Account is selected.

To quickly fix this error, we have to select the correct remote account.

Is it possible to remove the Generic Account or permanently set the correct remote account?

Settings revert back when we close and reopen Sourcetree.