BUGFIX: Fixed account display inaccuracies