Two Computers; One Account - How do I avoid locking myself out?

[KisaiTenshi]

Use the security token app. It's a good idea in any case.

This. I've never had a problem using it.

That said, make sure you follow instructions for removing it when you do major OS updates or you will have the same problem.