Should probably move this into AuthenticatedUser as well.