Disallow empty account number
Fix model name