diff --git a/CRM/Utils/System/Drupal8.php b/CRM/Utils/System/Drupal8.php
index 61ded6086528..df27c0d9e44a 100644
--- a/CRM/Utils/System/Drupal8.php
+++ b/CRM/Utils/System/Drupal8.php
@@ -114,6 +114,9 @@ public function updateCMSName($ufID, $email) {
     if ($user && $user->getEmail() != $email) {
       $user->setEmail($email);
 
+      // Skip requirement for password when changing the current user fields
+      $user->_skipProtectedUserFieldConstraint = TRUE;
+
       if (!count($user->validate())) {
         $user->save();
       }