Fixed issue with account completion
Fixed 'Account' issue with different languages
Reverted issue with first name completion
wip