Make current account detection more reliable #3

Closed shutterbug2000 closed 2 years ago