Fixed: Check for account