Fixed issue with account completion