Same change made to the account plugin.
Also you should use `self.load` directly.