FIX: accout type and account name