diff --git a/ParseModel/ParseModelUser.m b/ParseModel/ParseModelUser.m
index 5cded68..083cf6f 100644
--- a/ParseModel/ParseModelUser.m
+++ b/ParseModel/ParseModelUser.m
@@ -16,7 +16,7 @@ + (NSString *)parseModelClass
 {
     // Default Implementation.
     
-    return @"User";
+    return @"_User";
 }
 
 + (instancetype)parseModel
diff --git a/ParseModel/ParseModelUtils.m b/ParseModel/ParseModelUtils.m
index 1adffea..cb6249e 100644
--- a/ParseModel/ParseModelUtils.m
+++ b/ParseModel/ParseModelUtils.m
@@ -146,19 +146,20 @@ - (id)performUnboxingIfNecessary:(id)object targetClass:(Class)targetClass
         unboxedObject = unboxedDictionary;
     }
     
-    // Lastly, if this class is a PFObject or PFUser and it is registered, instantiate the appropriate ParseModel...
-    else if ([object isKindOfClass:[PFObject class]]) {
-        NSString *unboxedClassString = [self.registeredParseModels objectForKey:[(PFObject *)object parseClassName]];
-        if (unboxedClassString.length) {
-            unboxedObject = [[NSClassFromString(unboxedClassString) alloc] initWithParseObject:object];
-        }
-    }
+    // Lastly, if this class is a PFUser or PFObject (checking in that order) and it is registered, instantiate the appropriate ParseModel...
     else if ([object isKindOfClass:[PFUser class]]) {
         NSString *unboxedClassString = [self.registeredParseUsers objectForKey:[(PFUser *)object parseClassName]];
         if (unboxedClassString.length) {
             unboxedObject = [[NSClassFromString(unboxedClassString) alloc] initWithParseUser:object];
         }
     }
+    else if ([object isKindOfClass:[PFObject class]]) {
+        NSString *unboxedClassString = [self.registeredParseModels objectForKey:[(PFObject *)object parseClassName]];
+        if (unboxedClassString.length) {
+            unboxedObject = [[NSClassFromString(unboxedClassString) alloc] initWithParseObject:object];
+        }
+    }
+
     
     // Check for NSNull and destroy it. Sorry.
     if ([unboxedObject class] == [NSNull class]) {