AccountService: Implements default account failsafe

Implements one of the fixes outlined in issue #2637.

/cc @sendhil + @astralbodies + @koke 

I think this fixed a failing unit test - @jleandroperez I think made the change.