diff --git a/twitter.install b/twitter.install
index 452341e..c1b28ab 100644
--- a/twitter.install
+++ b/twitter.install
@@ -317,7 +317,7 @@ function twitter_schema() {
         'default' => 0,
       ),
     ),
-    'indexes' => array('screen_name' => array('screen_name')),
+    'indexes' => array('screen_name' => array('screen_name'), 'uid' => array('uid'),),
     'primary key' => array('twitter_uid'),
   );
 
@@ -477,3 +477,10 @@ function twitter_update_7503() {
   );
   db_change_field('twitter', 'twitter_id', 'twitter_id', $spec, $index_spec);
 }
+
+/**
+ * Add index on twitter_account.uid.
+ */
+function twitter_update_7504() {
+  db_add_index('twitter_account', 'uid', array('uid'));
+}