diff --git a/user/lib.php b/user/lib.php
index 63b94c98882..967f9256569 100644
--- a/user/lib.php
+++ b/user/lib.php
@@ -1601,11 +1601,8 @@ function user_edit_map_field_purpose($userid, $fieldname) {
     );
 
     $purpose = '';
-    if (!$currentuser) {
-        // Do not set a purpose.
-        $purpose = '';
-    }
-    if (isset($validmappings[$fieldname])) {
+    // Only set a purpose when editing your own user details.
+    if ($currentuser && isset($validmappings[$fieldname])) {
         $purpose = ' autocomplete="' . $validmappings[$fieldname] . '" ';
     }
 
diff --git a/user/tests/behat/behat_user.php b/user/tests/behat/behat_user.php
index 2e39f12be9e..a3f4bbaf27b 100644
--- a/user/tests/behat/behat_user.php
+++ b/user/tests/behat/behat_user.php
@@ -27,6 +27,8 @@
 
 require_once(__DIR__ . '/../../../lib/behat/behat_base.php');
 
+use Behat\Mink\Exception\ExpectationException as ExpectationException;
+
 /**
  * Steps definitions for users.
  *
@@ -83,7 +85,7 @@ class behat_user extends behat_base {
 
         $value = $fld->get_attribute('autocomplete');
         if ($value == $purpose) {
-            throw new ExpectationException('The "' . $field . '" field does have purposea "' . $purpose . '"', $this->getSession());
+            throw new ExpectationException('The "' . $field . '" field does have purpose "' . $purpose . '"', $this->getSession());
         }
     }
 }