fix: handle waitlist restricted error & don't clear errors always on … - #6818

eli-front:fix/oauth-callback-clears-errors was force-pushed and no longer has any new commits.

Pushing new commits will allow the pull request to be re-opened.