diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAutocompleteTest.php b/core/modules/user/lib/Drupal/user/Tests/UserAutocompleteTest.php
index 1f073d8..eda2685 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserAutocompleteTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserAutocompleteTest.php
@@ -50,7 +50,7 @@ function testUserAutocomplete() {
     // Test that anonymous username is in the result.
     $anonymous_name = $this->randomName();
     config('user.settings')->set('anonymous', $anonymous_name)->save();
-    $this->drupalGet('user/autocomplete', array('query' => array('q' => drupal_substr($anonymous_name, 0, 4), 'autocomplete' => '1')));
+    $this->drupalGet('user/autocomplete', array('query' => array('q' => drupal_substr($anonymous_name, 0, 4), 'anonymous' => '1')));
     $this->assertRaw($anonymous_name, 'The anonymous name found in autocompletion results.');
     $this->drupalGet('user/autocomplete', array('query' => array('q' => drupal_substr($anonymous_name, 0, 4))));
     $this->assertNoRaw($anonymous_name, 'The anonymous name not found in autocompletion results without enabling anonymous username.');
diff --git a/core/modules/user/user.pages.inc b/core/modules/user/user.pages.inc
index fdc615a..9fa30e3 100644
--- a/core/modules/user/user.pages.inc
+++ b/core/modules/user/user.pages.inc
@@ -19,8 +19,9 @@
  */
 function user_autocomplete() {
   $matches = array();
-  if ($string = drupal_container()->get('request')->query->get('q')) {
-    if (drupal_container()->get('request')->query->get('anonymous')) {
+  $query = drupal_container()->get('request')->query;
+  if ($string = $query->get('q')) {
+    if ($query->get('anonymous')) {
       $anonymous_name = config('user.settings')->get('anonymous');
       // Allow autocompletion for the anonymous user.
       if (stripos($anonymous_name, $string) !== FALSE) {