This prevents exising-but-expired tokens preventing new tokens from being loaded. Fixes #249 for GOA accounts