[Feature]: refactor 2fa flow

[lennartkloock]

Tell us about your Wish

Refactor the 2fa flow to what Troy suggested on Discord.

Is your feature related to a bug

No response

Alternatives

No response

Additional Info

No response

Participation

• [X] I am willing to submit a pull request to implement this

Disclaimer

• [X] I agree