accounts loader bug fixes