Started fixing the account stuff as per Dewight's request.