diff --git a/core/modules/user/user.entity.inc b/core/modules/user/user.entity.inc
index 5549c77..c8141c9 100644
--- a/core/modules/user/user.entity.inc
+++ b/core/modules/user/user.entity.inc
@@ -5,6 +5,125 @@
  */
 
 /**
+ * Defines the user entity class
+ */
+class User extends Entity {
+
+  /**
+   * The user ID.
+   *
+   * @var integer
+   */
+  public $uid;
+
+  /**
+   * The unique user name.
+   *
+   * @var string
+   */
+  public $name = '';
+
+  /**
+   * The user's password (hashed).
+   *
+   * @var string
+   */
+  public $pass;
+
+  /**
+   * The user's email address.
+   *
+   * @var string
+   */
+  public $mail = '';
+
+  /**
+   * The user's default theme.
+   *
+   * @var string
+   */
+  public $theme;
+
+  /**
+   * The user's signature.
+   *
+   * @var string
+   */
+  public $signature;
+
+  /**
+   * The user's signature format.
+   *
+   * @var string
+   */
+  public $signature_format = NULL;
+
+  /**
+   * The timestamp for when the user was create.
+   *
+   * @var integer
+   */
+  public $created = 0;
+
+  /**
+   * The timestamp for when the user last accessed the site.
+   *
+   * @var integer
+   */
+  public $access = 0;
+
+  /**
+   * The timestamp for when the user's last login.
+   *
+   * @var integer
+   */
+  public $login = 0;
+
+  /**
+   * Whether the user is active(1) or blocked(0).
+   *
+   * @var integer
+   */
+  public $status = 0;
+
+  /**
+   * The user's timezone.
+   *
+   * @var string
+   */
+  public $timezone = NULL;
+
+  /**
+   * The user's default language.
+   *
+   * @var string
+   */
+  public $language = '';
+
+  /**
+   * The fid of the user's picture.
+   *
+   * @var integer
+   */
+  public $picture = 0;
+
+  /**
+   * The email address used for initial account creation.
+   *
+   * @var string
+   */
+  public $init = '';
+
+  /**
+   * The user's roles.
+   *
+   * @var array
+   */
+  public $roles = array();
+
+}
+
+/**
  * Controller class for users.
  *
  * This extends the DrupalDefaultEntityController class, adding required
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 2dded35..d249ef3 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -151,6 +151,7 @@ function user_entity_info() {
       'uri callback' => 'user_uri',
       'label callback' => 'user_label',
       'fieldable' => TRUE,
+      'entity class' => 'User',
       'entity keys' => array(
         'id' => 'uid',
       ),