diff --git a/.gitignore b/.gitignore
index 8c94886e7c..f5a3e0212f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ config.php
 dataobject.ini
 *~
 *.bak
+*.orig
+*.rej
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index 9c879c9650..d6d31c4838 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -354,7 +354,7 @@ class TwittersettingsAction extends SettingsAction
             return false;
         }
 
-         $twitter_id = $user->status->id;
+         $twitter_id = $user->id;
 
         if ($twitter_id) {
             return $twitter_id;