diff --git a/twitter_pull.class.inc b/twitter_pull.class.inc
index 48adc6c..1e0ea4e 100644
--- a/twitter_pull.class.inc
+++ b/twitter_pull.class.inc
@@ -196,7 +196,10 @@ class twitter_puller {
 
         $item = (object) $item;
 
-        $user = !empty($item->retweeted_status) ? $item->retweeted_status->user : $item->user;
+        $user = (object) $item->user;
+        if (variable_get('twitter_pull_retweet_user', TRUE) && !empty($item->retweeted_status)) {
+          $user = (object)$item->retweeted_status['user'];
+        }
         
         $obj->id = check_plain($item->id_str);
         $obj->username = check_plain(!empty($user->name) ? $user->name : $item->from_user);