Additional checks on account import.

fix #539