Merge pull request #2440 from kaloudis/import-account-generate-account

Merge pull request #2440 from kaloudis/import-account-generate-account #5239