diff --git a/uc_order/src/Plugin/views/argument_validator/CurrentUserOrPermission.php b/uc_order/src/Plugin/views/argument_validator/CurrentUserOrPermission.php
index b08fe9e..6d8bcf7 100644
--- a/uc_order/src/Plugin/views/argument_validator/CurrentUserOrPermission.php
+++ b/uc_order/src/Plugin/views/argument_validator/CurrentUserOrPermission.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\uc_order\Plugin\views\argument_validator;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\user\Entity\User;
 use Drupal\views\Plugin\views\argument_validator\ArgumentValidatorPluginBase;
@@ -15,10 +14,6 @@ use Drupal\views\Plugin\views\argument_validator\ArgumentValidatorPluginBase;
 /**
  * Validate whether an argument is the current user or has a permission.
  *
- * This supports either numeric arguments (UID) or strings (username) and
- * converts either one into the user's UID.  This validator also sets the
- * argument's title to the username.
- *
  * @ViewsArgumentValidator(
  *   id = "user_or_permission",
  *   module = "uc_order",
@@ -32,9 +27,7 @@ class CurrentUserOrPermission extends ArgumentValidatorPluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['type'] = array('default' => 'uid');
     $options['perm'] = array('default' => 'view all orders');
-
     return $options;
   }
 
@@ -42,34 +35,15 @@ class CurrentUserOrPermission extends ArgumentValidatorPluginBase {
    * {@inheritdoc}
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    $form['type'] = array(
-      '#type' => 'radios',
-      '#title' => t('Type of user filter value to allow'),
-      '#options' => array(
-        'uid' => t('Only allow numeric UIDs'),
-        'name' => t('Only allow string usernames'),
-        'either' => t('Allow both numeric UIDs and string usernames'),
-      ),
-      '#default_value' => $this->options['type'],
-    );
-
-    $perms = array();
-    $module_info = system_get_info('module');
-
-    // Get list of permissions
-    $module_handler = \Drupal::moduleHandler();
-    foreach ($module_handler->getImplementations('permission') as $module) {
-      $permissions = $module_handler->invoke($module, 'permission');
-      foreach ($permissions as $name => $perm) {
-        $perms[$module_info[$module]['name']][$name] = strip_tags($perm['title']);
-      }
+    $options = [];
+    $permissions = \Drupal::service('user.permissions')->getPermissions();
+    foreach ($permissions as $name => $permission) {
+      $options[$permission['provider']][$name] = $permission['title'];
     }
 
-    asort($perms);
-
     $form['perm'] = array(
       '#type' => 'select',
-      '#options' => $perms,
+      '#options' => $options,
       '#title' => t('Permission'),
       '#default_value' => $this->options['perm'],
       '#description' => t('Users with the selected permission flag will be able to bypass validation.'),
@@ -80,72 +54,22 @@ class CurrentUserOrPermission extends ArgumentValidatorPluginBase {
    * {@inheritdoc}
    */
   public function validateArgument($argument) {
-    $type = $this->options['type'];
-    // is_numeric() can return false positives, so we ensure it's an integer.
-    // However, is_integer() will always fail, since $argument is a string.
-    if (is_numeric($argument) && $argument == (int)$argument) {
-      if ($type == 'uid' || $type == 'either') {
-        if ($argument == \Drupal::currentUser()->id()) {
-          // If you assign an object to a variable in PHP, the variable
-          // automatically acts as a reference, not a copy, so we use
-          // clone to ensure that we don't actually mess with the
-          // real global $user object.
-          $account = clone \Drupal::currentUser();
-        }
-        $condition = 'uid';
-      }
-    }
-    else {
-      if ($type == 'name' || $type == 'either') {
-        $name = !empty($GLOBALS['user']->name) ? $GLOBALS['user']->name : \Drupal::config('user.settings')->get('anonymous');
-        if ($argument == $name) {
-          $account = clone $GLOBALS['user'];
-        }
-        $condition = 'name';
-      }
-    }
-
-    // If we don't have a WHERE clause, the argument is invalid.
-    if (empty($condition)) {
+    // Check that the user actually exists.
+    if (!User::load($argument)) {
       return FALSE;
     }
 
-    if (!isset($account)) {
-      $account = db_select('users', 'u')
-        ->fields('u', array('uid', 'name'))
-        ->condition($condition, $argument)
-        ->execute()
-        ->fetchObject();
-    }
-    if (empty($account)) {
-      // User not found.
-      return FALSE;
+    // Check if the argument matches the current user ID.
+    if (\Drupal::currentUser()->id() == $argument) {
+      return TRUE;
     }
 
-    // If the current user is not the account specified by the argument
-    // and doesn't have the correct permission, validation fails.
-    if (\Drupal::currentUser()->id() != $account->id() && !$account->hasPermission($this->options['perm'])) {
-      return FALSE;
+    // Check if the current user has the bypass permission.
+    if (\Drupal::currentUser()->hasPermission($this->options['perm'])) {
+      return TRUE;
     }
 
-    $this->argument->argument = $account->id();
-    $this->argument->validated_title = SafeMarkup::checkPlain($account->hasPermission($account));
-    return TRUE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function processSummaryArguments(&$args) {
-    // If the validation says the input is an username, we should reverse the
-    // argument so it works for example for generation summary urls.
-    $uids_arg_keys = array_flip($args);
-    if ($this->options['type'] == 'name') {
-      $users = User::loadMultiple($args);
-      foreach ($users as $uid => $account) {
-        $args[$uids_arg_keys[$uid]] = $account->name;
-      }
-    }
+    return FALSE;
   }
 
 }