Quick fix in account and dashborad