diff --git a/app/models/user.rb b/app/models/user.rb
index 6cde300c6..9e4a8e0ec 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -440,7 +440,7 @@ class User < ActiveRecord::Base
       if base_upload_limit.to_i != 0
         limit = [base_upload_limit - (deleted_count / 2), 4].max - pending_count
       else
-        limit = [10 + [approved_count / 2, 90].min - (deleted_count / 2), 4].max - pending_count
+        limit = [10 + [approved_count / 2, 90].min - ([deleted_count / 10, 90].min), 4].max - pending_count
       end
 
       if limit < 0
diff --git a/app/presenters/user_presenter.rb b/app/presenters/user_presenter.rb
index ff752c4fa..927571fa6 100644
--- a/app/presenters/user_presenter.rb
+++ b/app/presenters/user_presenter.rb
@@ -45,7 +45,7 @@ class UserPresenter
     if user.base_upload_limit.to_i != 0
       string = "max(base_upload_limit:#{user.base_upload_limit} - (deleted_count:#{deleted_count} / 2), 4) - pending_count:#{pending_count}"
     else
-      string = "max(10 + min(approved_count:#{approved_count} / 2, 90) - (deleted_count:#{deleted_count} / 2), 4) - pending_count:#{pending_count}"
+      string = "max(10 + min(approved_count:#{approved_count} / 2, 90) - (min(deleted_count:#{deleted_count} / 10), 90), 4) - pending_count:#{pending_count}"
     end
     
     "#{string} = #{user.upload_limit} (deletions and approvals within past month)"