diff --git a/app/models/post.rb b/app/models/post.rb
index d22eafa32..020ef2469 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -739,6 +739,7 @@ class Post < ActiveRecord::Base
       
       Post.transaction do
         update_column(:is_deleted, true)
+        update_column(:is_pending, false)
         give_favorites_to_parent
         update_children_on_destroy
         update_parent_on_destroy
diff --git a/app/models/user.rb b/app/models/user.rb
index 96cc500a7..9cdffdb60 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -396,7 +396,7 @@ class User < ActiveRecord::Base
     def upload_limit
       deleted_count = Post.for_user(id).deleted.count
       pending_count = Post.for_user(id).pending.count
-      approved_count = Post.where("is_flagged = false and is_pending = false and is_deleted = false and uploader_id = ?", id).count
+      approved_count = Post.where("is_pending = false and is_deleted = false and uploader_id = ?", id).count
       
       if base_upload_limit
         limit = base_upload_limit - pending_count
diff --git a/app/presenters/user_presenter.rb b/app/presenters/user_presenter.rb
index f5b388d4c..c8e69007d 100644
--- a/app/presenters/user_presenter.rb
+++ b/app/presenters/user_presenter.rb
@@ -48,7 +48,7 @@ class UserPresenter
     
     deleted_count = Post.for_user(user.id).deleted.count
     pending_count = Post.for_user(user.id).pending.count
-    approved_count = Post.where("is_flagged = false and is_pending = false and is_deleted = false and uploader_id = ?", user.id).count
+    approved_count = Post.where("is_pending = false and is_deleted = false and uploader_id = ?", user.id).count
     
     if user.base_upload_limit
       limit = user.base_upload_limit - pending_count