diff --git a/app/models/user.rb b/app/models/user.rb
index bdc047a29..11dcdd26e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -423,12 +423,14 @@ class User < ActiveRecord::Base
     end
     
     def favorite_limit
+      return nil
+      
       if is_privileged?
-        5_000
+        20_000
       elsif is_platinum?
         nil
       else
-        1_000
+        4_000
       end
     end
   end
diff --git a/app/views/users/upgrade_information.html.erb b/app/views/users/upgrade_information.html.erb
index 9f979c9ce..c1af72f59 100644
--- a/app/views/users/upgrade_information.html.erb
+++ b/app/views/users/upgrade_information.html.erb
@@ -39,8 +39,8 @@
           </tr>
           <tr>
             <td>Favorite Limit</td>
-            <td>1,000</td>
-            <td>5,000</td>
+            <td>4,000</td>
+            <td>20,000</td>
             <td>Unlimited</td>
           </tr>
           <tr>