diff --git a/lib/OpenCloud/Identity/Resource/User.php b/lib/OpenCloud/Identity/Resource/User.php
index 404496652..736fbd09f 100644
--- a/lib/OpenCloud/Identity/Resource/User.php
+++ b/lib/OpenCloud/Identity/Resource/User.php
@@ -20,6 +20,7 @@
 use OpenCloud\Common\Collection\PaginatedIterator;
 use OpenCloud\Common\Http\Message\Formatter;
 use OpenCloud\Common\PersistentObject;
+use OpenCloud\Rackspace;
 
 /**
  * User class which encapsulates functionality for a user.
@@ -68,6 +69,18 @@ class User extends PersistentObject
     protected static $url_resource = 'users';
     protected static $json_name = 'user';
 
+    public function createJson()
+    {
+        $json = parent::createJson();
+
+        if ($this->getClient() instanceof Rackspace) {
+            $json->user->username = $json->user->name;
+            unset($json->user->name);
+        }
+
+        return $json;
+    }
+
     /**
      * @param $region Set the default region
      */