Fix auto complete for account