Default Account ID When Punching Out

It is causing issues when a customer is not setup in B2B and the account ends up defaulting to the first property. The customer punching out is then not aware they may be punching out as a different property and we are not aware that there is an issue with the account they were attempting to punchout as unless they notice the issue and reach out to us.

I am proposing that we stop defaulting to the first account if there is not an account loaded for the property that they are punching out as. I would then either like an error message with who to reach out to for a solution and also a report/notification on our side on who the user was trying to punchout along with information like Address ID, account etc.