Bug fix for account creation