fixing Account and AccountView