Change to UserNotifier