diff --git a/Changelog.md b/Changelog.md
index c4f764dd3..e3f1dc94b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -20,7 +20,7 @@ Diaspora::Application.config.secret_key_base = '*************...'
 ## Features
 * Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)
 * Better character limit message [#5151](https://github.com/diaspora/diaspora/pull/5151)
-
+* Remember whether a AccountDeletion was performed [#5156](https://github.com/diaspora/diaspora/pull/5156)
 # 0.4.1.0
 
 ## Refactor
diff --git a/app/models/account_deletion.rb b/app/models/account_deletion.rb
index 7b1886269..a8918d587 100644
--- a/app/models/account_deletion.rb
+++ b/app/models/account_deletion.rb
@@ -5,6 +5,7 @@
 class AccountDeletion < ActiveRecord::Base
   include Diaspora::Federated::Base
 
+  scope :uncompleted, -> { where('completed_at is null') }
 
   belongs_to :person
   after_commit :queue_delete_account, :on => :create
diff --git a/db/migrate/20140824230505_add_completed_at_to_account_deletions.rb b/db/migrate/20140824230505_add_completed_at_to_account_deletions.rb
new file mode 100644
index 000000000..9b2af8c6a
--- /dev/null
+++ b/db/migrate/20140824230505_add_completed_at_to_account_deletions.rb
@@ -0,0 +1,5 @@
+class AddCompletedAtToAccountDeletions < ActiveRecord::Migration
+  def change
+    add_column :account_deletions, :completed_at, :datetime
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index e835151fb..007a4077f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -9,213 +9,214 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140601102543) do
+ActiveRecord::Schema.define(version: 20140824230505) do
 
-  create_table "account_deletions", :force => true do |t|
-    t.string  "diaspora_handle"
-    t.integer "person_id"
+  create_table "account_deletions", force: true do |t|
+    t.string   "diaspora_handle"
+    t.integer  "person_id"
+    t.datetime "completed_at"
   end
 
-  create_table "aspect_memberships", :force => true do |t|
-    t.integer  "aspect_id",  :null => false
-    t.integer  "contact_id", :null => false
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+  create_table "aspect_memberships", force: true do |t|
+    t.integer  "aspect_id",  null: false
+    t.integer  "contact_id", null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  add_index "aspect_memberships", ["aspect_id", "contact_id"], :name => "index_aspect_memberships_on_aspect_id_and_contact_id", :unique => true
-  add_index "aspect_memberships", ["aspect_id"], :name => "index_aspect_memberships_on_aspect_id"
-  add_index "aspect_memberships", ["contact_id"], :name => "index_aspect_memberships_on_contact_id"
+  add_index "aspect_memberships", ["aspect_id", "contact_id"], name: "index_aspect_memberships_on_aspect_id_and_contact_id", unique: true, using: :btree
+  add_index "aspect_memberships", ["aspect_id"], name: "index_aspect_memberships_on_aspect_id", using: :btree
+  add_index "aspect_memberships", ["contact_id"], name: "index_aspect_memberships_on_contact_id", using: :btree
 
-  create_table "aspect_visibilities", :force => true do |t|
-    t.integer  "shareable_id",                       :null => false
-    t.integer  "aspect_id",                          :null => false
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-    t.string   "shareable_type", :default => "Post", :null => false
+  create_table "aspect_visibilities", force: true do |t|
+    t.integer  "shareable_id",                    null: false
+    t.integer  "aspect_id",                       null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "shareable_type", default: "Post", null: false
   end
 
-  add_index "aspect_visibilities", ["aspect_id"], :name => "index_aspect_visibilities_on_aspect_id"
-  add_index "aspect_visibilities", ["shareable_id", "shareable_type", "aspect_id"], :name => "shareable_and_aspect_id"
-  add_index "aspect_visibilities", ["shareable_id", "shareable_type"], :name => "index_aspect_visibilities_on_shareable_id_and_shareable_type"
+  add_index "aspect_visibilities", ["aspect_id"], name: "index_aspect_visibilities_on_aspect_id", using: :btree
+  add_index "aspect_visibilities", ["shareable_id", "shareable_type", "aspect_id"], name: "shareable_and_aspect_id", using: :btree
+  add_index "aspect_visibilities", ["shareable_id", "shareable_type"], name: "index_aspect_visibilities_on_shareable_id_and_shareable_type", using: :btree
 
-  create_table "aspects", :force => true do |t|
-    t.string   "name",                               :null => false
-    t.integer  "user_id",                            :null => false
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-    t.boolean  "contacts_visible", :default => true, :null => false
+  create_table "aspects", force: true do |t|
+    t.string   "name",                            null: false
+    t.integer  "user_id",                         null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "contacts_visible", default: true, null: false
     t.integer  "order_id"
   end
 
-  add_index "aspects", ["user_id", "contacts_visible"], :name => "index_aspects_on_user_id_and_contacts_visible"
-  add_index "aspects", ["user_id"], :name => "index_aspects_on_user_id"
+  add_index "aspects", ["user_id", "contacts_visible"], name: "index_aspects_on_user_id_and_contacts_visible", using: :btree
+  add_index "aspects", ["user_id"], name: "index_aspects_on_user_id", using: :btree
 
-  create_table "blocks", :force => true do |t|
+  create_table "blocks", force: true do |t|
     t.integer "user_id"
     t.integer "person_id"
   end
 
-  create_table "comments", :force => true do |t|
-    t.text     "text",                                                      :null => false
-    t.integer  "commentable_id",                                            :null => false
-    t.integer  "author_id",                                                 :null => false
-    t.string   "guid",                                                      :null => false
+  create_table "comments", force: true do |t|
+    t.text     "text",                                                null: false
+    t.integer  "commentable_id",                                      null: false
+    t.integer  "author_id",                                           null: false
+    t.string   "guid",                                                null: false
     t.text     "author_signature"
     t.text     "parent_author_signature"
-    t.datetime "created_at",                                                :null => false
-    t.datetime "updated_at",                                                :null => false
-    t.integer  "likes_count",                           :default => 0,      :null => false
-    t.string   "commentable_type",        :limit => 60, :default => "Post", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "likes_count",                        default: 0,      null: false
+    t.string   "commentable_type",        limit: 60, default: "Post", null: false
   end
 
-  add_index "comments", ["author_id"], :name => "index_comments_on_person_id"
-  add_index "comments", ["commentable_id", "commentable_type"], :name => "index_comments_on_commentable_id_and_commentable_type"
-  add_index "comments", ["guid"], :name => "index_comments_on_guid", :unique => true
+  add_index "comments", ["author_id"], name: "index_comments_on_author_id", using: :btree
+  add_index "comments", ["commentable_id", "commentable_type"], name: "index_comments_on_commentable_id_and_commentable_type", using: :btree
+  add_index "comments", ["guid"], name: "index_comments_on_guid", unique: true, using: :btree
 
-  create_table "contacts", :force => true do |t|
-    t.integer  "user_id",                       :null => false
-    t.integer  "person_id",                     :null => false
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.boolean  "sharing",    :default => false, :null => false
-    t.boolean  "receiving",  :default => false, :null => false
+  create_table "contacts", force: true do |t|
+    t.integer  "user_id",                    null: false
+    t.integer  "person_id",                  null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "sharing",    default: false, null: false
+    t.boolean  "receiving",  default: false, null: false
   end
 
-  add_index "contacts", ["person_id"], :name => "index_contacts_on_person_id"
-  add_index "contacts", ["user_id", "person_id"], :name => "index_contacts_on_user_id_and_person_id", :unique => true
+  add_index "contacts", ["person_id"], name: "index_contacts_on_person_id", using: :btree
+  add_index "contacts", ["user_id", "person_id"], name: "index_contacts_on_user_id_and_person_id", unique: true, using: :btree
 
-  create_table "conversation_visibilities", :force => true do |t|
-    t.integer  "conversation_id",                :null => false
-    t.integer  "person_id",                      :null => false
-    t.integer  "unread",          :default => 0, :null => false
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
+  create_table "conversation_visibilities", force: true do |t|
+    t.integer  "conversation_id",             null: false
+    t.integer  "person_id",                   null: false
+    t.integer  "unread",          default: 0, null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  add_index "conversation_visibilities", ["conversation_id", "person_id"], :name => "index_conversation_visibilities_usefully", :unique => true
-  add_index "conversation_visibilities", ["conversation_id"], :name => "index_conversation_visibilities_on_conversation_id"
-  add_index "conversation_visibilities", ["person_id"], :name => "index_conversation_visibilities_on_person_id"
+  add_index "conversation_visibilities", ["conversation_id", "person_id"], name: "index_conversation_visibilities_usefully", unique: true, using: :btree
+  add_index "conversation_visibilities", ["conversation_id"], name: "index_conversation_visibilities_on_conversation_id", using: :btree
+  add_index "conversation_visibilities", ["person_id"], name: "index_conversation_visibilities_on_person_id", using: :btree
 
-  create_table "conversations", :force => true do |t|
+  create_table "conversations", force: true do |t|
     t.string   "subject"
-    t.string   "guid",       :null => false
-    t.integer  "author_id",  :null => false
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.string   "guid",       null: false
+    t.integer  "author_id",  null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  add_index "conversations", ["author_id"], :name => "conversations_author_id_fk"
+  add_index "conversations", ["author_id"], name: "conversations_author_id_fk", using: :btree
 
-  create_table "invitation_codes", :force => true do |t|
+  create_table "invitation_codes", force: true do |t|
     t.string   "token"
     t.integer  "user_id"
     t.integer  "count"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "invitations", :force => true do |t|
+  create_table "invitations", force: true do |t|
     t.text     "message"
     t.integer  "sender_id"
     t.integer  "recipient_id"
     t.integer  "aspect_id"
-    t.datetime "created_at",                      :null => false
-    t.datetime "updated_at",                      :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "service"
     t.string   "identifier"
-    t.boolean  "admin",        :default => false
-    t.string   "language",     :default => "en"
+    t.boolean  "admin",        default: false
+    t.string   "language",     default: "en"
   end
 
-  add_index "invitations", ["aspect_id"], :name => "index_invitations_on_aspect_id"
-  add_index "invitations", ["recipient_id"], :name => "index_invitations_on_recipient_id"
-  add_index "invitations", ["sender_id"], :name => "index_invitations_on_sender_id"
+  add_index "invitations", ["aspect_id"], name: "index_invitations_on_aspect_id", using: :btree
+  add_index "invitations", ["recipient_id"], name: "index_invitations_on_recipient_id", using: :btree
+  add_index "invitations", ["sender_id"], name: "index_invitations_on_sender_id", using: :btree
 
-  create_table "likes", :force => true do |t|
-    t.boolean  "positive",                              :default => true
+  create_table "likes", force: true do |t|
+    t.boolean  "positive",                           default: true
     t.integer  "target_id"
     t.integer  "author_id"
     t.string   "guid"
     t.text     "author_signature"
     t.text     "parent_author_signature"
-    t.datetime "created_at",                                              :null => false
-    t.datetime "updated_at",                                              :null => false
-    t.string   "target_type",             :limit => 60,                   :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "target_type",             limit: 60,                null: false
   end
 
-  add_index "likes", ["author_id"], :name => "likes_author_id_fk"
-  add_index "likes", ["guid"], :name => "index_likes_on_guid", :unique => true
-  add_index "likes", ["target_id", "author_id", "target_type"], :name => "index_likes_on_target_id_and_author_id_and_target_type", :unique => true
-  add_index "likes", ["target_id"], :name => "index_likes_on_post_id"
+  add_index "likes", ["author_id"], name: "likes_author_id_fk", using: :btree
+  add_index "likes", ["guid"], name: "index_likes_on_guid", unique: true, using: :btree
+  add_index "likes", ["target_id", "author_id", "target_type"], name: "index_likes_on_target_id_and_author_id_and_target_type", unique: true, using: :btree
+  add_index "likes", ["target_id"], name: "index_likes_on_target_id", using: :btree
 
-  create_table "locations", :force => true do |t|
+  create_table "locations", force: true do |t|
     t.string   "address"
     t.string   "lat"
     t.string   "lng"
     t.integer  "status_message_id"
-    t.datetime "created_at",        :null => false
-    t.datetime "updated_at",        :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "mentions", :force => true do |t|
-    t.integer "post_id",   :null => false
-    t.integer "person_id", :null => false
+  create_table "mentions", force: true do |t|
+    t.integer "post_id",   null: false
+    t.integer "person_id", null: false
   end
 
-  add_index "mentions", ["person_id", "post_id"], :name => "index_mentions_on_person_id_and_post_id", :unique => true
-  add_index "mentions", ["person_id"], :name => "index_mentions_on_person_id"
-  add_index "mentions", ["post_id"], :name => "index_mentions_on_post_id"
+  add_index "mentions", ["person_id", "post_id"], name: "index_mentions_on_person_id_and_post_id", unique: true, using: :btree
+  add_index "mentions", ["person_id"], name: "index_mentions_on_person_id", using: :btree
+  add_index "mentions", ["post_id"], name: "index_mentions_on_post_id", using: :btree
 
-  create_table "messages", :force => true do |t|
-    t.integer  "conversation_id",         :null => false
-    t.integer  "author_id",               :null => false
-    t.string   "guid",                    :null => false
-    t.text     "text",                    :null => false
-    t.datetime "created_at",              :null => false
-    t.datetime "updated_at",              :null => false
+  create_table "messages", force: true do |t|
+    t.integer  "conversation_id",         null: false
+    t.integer  "author_id",               null: false
+    t.string   "guid",                    null: false
+    t.text     "text",                    null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.text     "author_signature"
     t.text     "parent_author_signature"
   end
 
-  add_index "messages", ["author_id"], :name => "index_messages_on_author_id"
-  add_index "messages", ["conversation_id"], :name => "messages_conversation_id_fk"
+  add_index "messages", ["author_id"], name: "index_messages_on_author_id", using: :btree
+  add_index "messages", ["conversation_id"], name: "messages_conversation_id_fk", using: :btree
 
-  create_table "notification_actors", :force => true do |t|
+  create_table "notification_actors", force: true do |t|
     t.integer  "notification_id"
     t.integer  "person_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  add_index "notification_actors", ["notification_id", "person_id"], :name => "index_notification_actors_on_notification_id_and_person_id", :unique => true
-  add_index "notification_actors", ["notification_id"], :name => "index_notification_actors_on_notification_id"
-  add_index "notification_actors", ["person_id"], :name => "index_notification_actors_on_person_id"
+  add_index "notification_actors", ["notification_id", "person_id"], name: "index_notification_actors_on_notification_id_and_person_id", unique: true, using: :btree
+  add_index "notification_actors", ["notification_id"], name: "index_notification_actors_on_notification_id", using: :btree
+  add_index "notification_actors", ["person_id"], name: "index_notification_actors_on_person_id", using: :btree
 
-  create_table "notifications", :force => true do |t|
+  create_table "notifications", force: true do |t|
     t.string   "target_type"
     t.integer  "target_id"
-    t.integer  "recipient_id",                   :null => false
-    t.boolean  "unread",       :default => true, :null => false
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
+    t.integer  "recipient_id",                null: false
+    t.boolean  "unread",       default: true, null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "type"
   end
 
-  add_index "notifications", ["recipient_id"], :name => "index_notifications_on_recipient_id"
-  add_index "notifications", ["target_id"], :name => "index_notifications_on_target_id"
-  add_index "notifications", ["target_type", "target_id"], :name => "index_notifications_on_target_type_and_target_id"
+  add_index "notifications", ["recipient_id"], name: "index_notifications_on_recipient_id", using: :btree
+  add_index "notifications", ["target_id"], name: "index_notifications_on_target_id", using: :btree
+  add_index "notifications", ["target_type", "target_id"], name: "index_notifications_on_target_type_and_target_id", using: :btree
 
-  create_table "o_embed_caches", :force => true do |t|
-    t.string "url",  :limit => 1024, :null => false
-    t.text   "data",                 :null => false
+  create_table "o_embed_caches", force: true do |t|
+    t.string "url",  limit: 1024, null: false
+    t.text   "data",              null: false
   end
 
-  add_index "o_embed_caches", ["url"], :name => "index_o_embed_caches_on_url", :length => {"url"=>255}
+  add_index "o_embed_caches", ["url"], name: "index_o_embed_caches_on_url", length: {"url"=>255}, using: :btree
 
-  create_table "open_graph_caches", :force => true do |t|
+  create_table "open_graph_caches", force: true do |t|
     t.string "title"
     t.string "ob_type"
     t.string "image"
@@ -223,43 +224,43 @@ ActiveRecord::Schema.define(:version => 20140601102543) do
     t.text   "description"
   end
 
-  create_table "participations", :force => true do |t|
+  create_table "participations", force: true do |t|
     t.string   "guid"
     t.integer  "target_id"
-    t.string   "target_type",             :limit => 60, :null => false
+    t.string   "target_type",             limit: 60, null: false
     t.integer  "author_id"
     t.text     "author_signature"
     t.text     "parent_author_signature"
-    t.datetime "created_at",                            :null => false
-    t.datetime "updated_at",                            :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  add_index "participations", ["guid"], :name => "index_participations_on_guid"
-  add_index "participations", ["target_id", "target_type", "author_id"], :name => "index_participations_on_target_id_and_target_type_and_author_id"
+  add_index "participations", ["guid"], name: "index_participations_on_guid", using: :btree
+  add_index "participations", ["target_id", "target_type", "author_id"], name: "index_participations_on_target_id_and_target_type_and_author_id", using: :btree
 
-  create_table "people", :force => true do |t|
-    t.string   "guid",                                     :null => false
-    t.text     "url",                                      :null => false
-    t.string   "diaspora_handle",                          :null => false
-    t.text     "serialized_public_key",                    :null => false
+  create_table "people", force: true do |t|
+    t.string   "guid",                                  null: false
+    t.text     "url",                                   null: false
+    t.string   "diaspora_handle",                       null: false
+    t.text     "serialized_public_key",                 null: false
     t.integer  "owner_id"
-    t.datetime "created_at",                               :null => false
-    t.datetime "updated_at",                               :null => false
-    t.boolean  "closed_account",        :default => false
-    t.integer  "fetch_status",          :default => 0
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "closed_account",        default: false
+    t.integer  "fetch_status",          default: 0
   end
 
-  add_index "people", ["diaspora_handle"], :name => "index_people_on_diaspora_handle", :unique => true
-  add_index "people", ["guid"], :name => "index_people_on_guid", :unique => true
-  add_index "people", ["owner_id"], :name => "index_people_on_owner_id", :unique => true
+  add_index "people", ["diaspora_handle"], name: "index_people_on_diaspora_handle", unique: true, using: :btree
+  add_index "people", ["guid"], name: "index_people_on_guid", unique: true, using: :btree
+  add_index "people", ["owner_id"], name: "index_people_on_owner_id", unique: true, using: :btree
 
-  create_table "photos", :force => true do |t|
+  create_table "photos", force: true do |t|
     t.integer  "tmp_old_id"
-    t.integer  "author_id",                              :null => false
-    t.boolean  "public",              :default => false, :null => false
+    t.integer  "author_id",                           null: false
+    t.boolean  "public",              default: false, null: false
     t.string   "diaspora_handle"
-    t.string   "guid",                                   :null => false
-    t.boolean  "pending",             :default => false, :null => false
+    t.string   "guid",                                null: false
+    t.boolean  "pending",             default: false, null: false
     t.text     "text"
     t.text     "remote_photo_path"
     t.string   "remote_photo_name"
@@ -274,62 +275,62 @@ ActiveRecord::Schema.define(:version => 20140601102543) do
     t.integer  "width"
   end
 
-  add_index "photos", ["status_message_guid"], :name => "index_photos_on_status_message_guid"
+  add_index "photos", ["status_message_guid"], name: "index_photos_on_status_message_guid", using: :btree
 
-  create_table "pods", :force => true do |t|
+  create_table "pods", force: true do |t|
     t.string   "host"
     t.boolean  "ssl"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "poll_answers", :force => true do |t|
-    t.string  "answer",                    :null => false
-    t.integer "poll_id",                   :null => false
+  create_table "poll_answers", force: true do |t|
+    t.string  "answer",                 null: false
+    t.integer "poll_id",                null: false
     t.string  "guid"
-    t.integer "vote_count", :default => 0
+    t.integer "vote_count", default: 0
   end
 
-  add_index "poll_answers", ["poll_id"], :name => "index_poll_answers_on_poll_id"
+  add_index "poll_answers", ["poll_id"], name: "index_poll_answers_on_poll_id", using: :btree
 
-  create_table "poll_participations", :force => true do |t|
-    t.integer  "poll_answer_id",          :null => false
-    t.integer  "author_id",               :null => false
-    t.integer  "poll_id",                 :null => false
+  create_table "poll_participations", force: true do |t|
+    t.integer  "poll_answer_id",          null: false
+    t.integer  "author_id",               null: false
+    t.integer  "poll_id",                 null: false
     t.string   "guid"
     t.text     "author_signature"
     t.text     "parent_author_signature"
-    t.datetime "created_at",              :null => false
-    t.datetime "updated_at",              :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  add_index "poll_participations", ["poll_id"], :name => "index_poll_participations_on_poll_id"
+  add_index "poll_participations", ["poll_id"], name: "index_poll_participations_on_poll_id", using: :btree
 
-  create_table "polls", :force => true do |t|
-    t.string   "question",          :null => false
-    t.integer  "status_message_id", :null => false
+  create_table "polls", force: true do |t|
+    t.string   "question",          null: false
+    t.integer  "status_message_id", null: false
     t.boolean  "status"
     t.string   "guid"
-    t.datetime "created_at",        :null => false
-    t.datetime "updated_at",        :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  add_index "polls", ["status_message_id"], :name => "index_polls_on_status_message_id"
+  add_index "polls", ["status_message_id"], name: "index_polls_on_status_message_id", using: :btree
 
-  create_table "posts", :force => true do |t|
-    t.integer  "author_id",                                              :null => false
-    t.boolean  "public",                              :default => false, :null => false
+  create_table "posts", force: true do |t|
+    t.integer  "author_id",                                        null: false
+    t.boolean  "public",                           default: false, null: false
     t.string   "diaspora_handle"
-    t.string   "guid",                                                   :null => false
-    t.boolean  "pending",                             :default => false, :null => false
-    t.string   "type",                  :limit => 40,                    :null => false
+    t.string   "guid",                                             null: false
+    t.boolean  "pending",                          default: false, null: false
+    t.string   "type",                  limit: 40,                 null: false
     t.text     "text"
     t.text     "remote_photo_path"
     t.string   "remote_photo_name"
     t.string   "random_string"
     t.string   "processed_image"
-    t.datetime "created_at",                                             :null => false
-    t.datetime "updated_at",                                             :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "unprocessed_image"
     t.string   "object_url"
     t.string   "image_url"
@@ -340,202 +341,202 @@ ActiveRecord::Schema.define(:version => 20140601102543) do
     t.string   "objectId"
     t.string   "root_guid"
     t.string   "status_message_guid"
-    t.integer  "likes_count",                         :default => 0
-    t.integer  "comments_count",                      :default => 0
+    t.integer  "likes_count",                      default: 0
+    t.integer  "comments_count",                   default: 0
     t.integer  "o_embed_cache_id"
-    t.integer  "reshares_count",                      :default => 0
+    t.integer  "reshares_count",                   default: 0
     t.datetime "interacted_at"
     t.string   "frame_name"
-    t.boolean  "favorite",                            :default => false
+    t.boolean  "favorite",                         default: false
     t.string   "facebook_id"
     t.string   "tweet_id"
     t.integer  "open_graph_cache_id"
     t.text     "tumblr_ids"
   end
 
-  add_index "posts", ["author_id", "root_guid"], :name => "index_posts_on_author_id_and_root_guid", :unique => true
-  add_index "posts", ["author_id"], :name => "index_posts_on_person_id"
-  add_index "posts", ["guid"], :name => "index_posts_on_guid", :unique => true
-  add_index "posts", ["id", "type", "created_at"], :name => "index_posts_on_id_and_type_and_created_at"
-  add_index "posts", ["root_guid"], :name => "index_posts_on_root_guid"
-  add_index "posts", ["status_message_guid", "pending"], :name => "index_posts_on_status_message_guid_and_pending"
-  add_index "posts", ["status_message_guid"], :name => "index_posts_on_status_message_guid"
-  add_index "posts", ["tweet_id"], :name => "index_posts_on_tweet_id"
-  add_index "posts", ["type", "pending", "id"], :name => "index_posts_on_type_and_pending_and_id"
+  add_index "posts", ["author_id", "root_guid"], name: "index_posts_on_author_id_and_root_guid", unique: true, using: :btree
+  add_index "posts", ["author_id"], name: "index_posts_on_author_id", using: :btree
+  add_index "posts", ["guid"], name: "index_posts_on_guid", unique: true, using: :btree
+  add_index "posts", ["id", "type", "created_at"], name: "index_posts_on_id_and_type_and_created_at", using: :btree
+  add_index "posts", ["root_guid"], name: "index_posts_on_root_guid", using: :btree
+  add_index "posts", ["status_message_guid", "pending"], name: "index_posts_on_status_message_guid_and_pending", using: :btree
+  add_index "posts", ["status_message_guid"], name: "index_posts_on_status_message_guid", using: :btree
+  add_index "posts", ["tweet_id"], name: "index_posts_on_tweet_id", using: :btree
+  add_index "posts", ["type", "pending", "id"], name: "index_posts_on_type_and_pending_and_id", using: :btree
 
-  create_table "profiles", :force => true do |t|
+  create_table "profiles", force: true do |t|
     t.string   "diaspora_handle"
-    t.string   "first_name",       :limit => 127
-    t.string   "last_name",        :limit => 127
+    t.string   "first_name",       limit: 127
+    t.string   "last_name",        limit: 127
     t.string   "image_url"
     t.string   "image_url_small"
     t.string   "image_url_medium"
     t.date     "birthday"
     t.string   "gender"
     t.text     "bio"
-    t.boolean  "searchable",                      :default => true,  :null => false
-    t.integer  "person_id",                                          :null => false
-    t.datetime "created_at",                                         :null => false
-    t.datetime "updated_at",                                         :null => false
+    t.boolean  "searchable",                   default: true,  null: false
+    t.integer  "person_id",                                    null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "location"
-    t.string   "full_name",        :limit => 70
-    t.boolean  "nsfw",                            :default => false
+    t.string   "full_name",        limit: 70
+    t.boolean  "nsfw",                         default: false
   end
 
-  add_index "profiles", ["full_name", "searchable"], :name => "index_profiles_on_full_name_and_searchable"
-  add_index "profiles", ["full_name"], :name => "index_profiles_on_full_name"
-  add_index "profiles", ["person_id"], :name => "index_profiles_on_person_id"
+  add_index "profiles", ["full_name", "searchable"], name: "index_profiles_on_full_name_and_searchable", using: :btree
+  add_index "profiles", ["full_name"], name: "index_profiles_on_full_name", using: :btree
+  add_index "profiles", ["person_id"], name: "index_profiles_on_person_id", using: :btree
 
-  create_table "rails_admin_histories", :force => true do |t|
+  create_table "rails_admin_histories", force: true do |t|
     t.text     "message"
     t.string   "username"
     t.integer  "item"
     t.string   "table"
-    t.integer  "month",      :limit => 2
-    t.integer  "year",       :limit => 8
-    t.datetime "created_at",              :null => false
-    t.datetime "updated_at",              :null => false
+    t.integer  "month",      limit: 2
+    t.integer  "year",       limit: 8
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  add_index "rails_admin_histories", ["item", "table", "month", "year"], :name => "index_rails_admin_histories"
+  add_index "rails_admin_histories", ["item", "table", "month", "year"], name: "index_rails_admin_histories", using: :btree
 
-  create_table "reports", :force => true do |t|
-    t.integer  "item_id",                       :null => false
-    t.string   "item_type",                     :null => false
-    t.boolean  "reviewed",   :default => false
+  create_table "reports", force: true do |t|
+    t.integer  "item_id",                    null: false
+    t.string   "item_type",                  null: false
+    t.boolean  "reviewed",   default: false
     t.text     "text"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.integer  "user_id",                       :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "user_id",                    null: false
   end
 
-  add_index "reports", ["item_id"], :name => "index_post_reports_on_post_id"
+  add_index "reports", ["item_id"], name: "index_reports_on_item_id", using: :btree
 
-  create_table "roles", :force => true do |t|
+  create_table "roles", force: true do |t|
     t.integer  "person_id"
     t.string   "name"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "services", :force => true do |t|
-    t.string   "type",          :limit => 127, :null => false
-    t.integer  "user_id",                      :null => false
-    t.string   "uid",           :limit => 127
+  create_table "services", force: true do |t|
+    t.string   "type",          limit: 127, null: false
+    t.integer  "user_id",                   null: false
+    t.string   "uid",           limit: 127
     t.string   "access_token"
     t.string   "access_secret"
     t.string   "nickname"
-    t.datetime "created_at",                   :null => false
-    t.datetime "updated_at",                   :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  add_index "services", ["type", "uid"], :name => "index_services_on_type_and_uid"
-  add_index "services", ["user_id"], :name => "index_services_on_user_id"
+  add_index "services", ["type", "uid"], name: "index_services_on_type_and_uid", using: :btree
+  add_index "services", ["user_id"], name: "index_services_on_user_id", using: :btree
 
-  create_table "share_visibilities", :force => true do |t|
-    t.integer  "shareable_id",                                     :null => false
-    t.datetime "created_at",                                       :null => false
-    t.datetime "updated_at",                                       :null => false
-    t.boolean  "hidden",                       :default => false,  :null => false
-    t.integer  "contact_id",                                       :null => false
-    t.string   "shareable_type", :limit => 60, :default => "Post", :null => false
+  create_table "share_visibilities", force: true do |t|
+    t.integer  "shareable_id",                               null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "hidden",                    default: false,  null: false
+    t.integer  "contact_id",                                 null: false
+    t.string   "shareable_type", limit: 60, default: "Post", null: false
   end
 
-  add_index "share_visibilities", ["contact_id"], :name => "index_post_visibilities_on_contact_id"
-  add_index "share_visibilities", ["shareable_id", "shareable_type", "contact_id"], :name => "shareable_and_contact_id"
-  add_index "share_visibilities", ["shareable_id", "shareable_type", "hidden", "contact_id"], :name => "shareable_and_hidden_and_contact_id"
-  add_index "share_visibilities", ["shareable_id"], :name => "index_post_visibilities_on_post_id"
+  add_index "share_visibilities", ["contact_id"], name: "index_share_visibilities_on_contact_id", using: :btree
+  add_index "share_visibilities", ["shareable_id", "shareable_type", "contact_id"], name: "shareable_and_contact_id", using: :btree
+  add_index "share_visibilities", ["shareable_id", "shareable_type", "hidden", "contact_id"], name: "shareable_and_hidden_and_contact_id", using: :btree
+  add_index "share_visibilities", ["shareable_id"], name: "index_share_visibilities_on_post_id", using: :btree
 
-  create_table "simple_captcha_data", :force => true do |t|
-    t.string   "key",        :limit => 40
-    t.string   "value",      :limit => 6
-    t.datetime "created_at",               :null => false
-    t.datetime "updated_at",               :null => false
+  create_table "simple_captcha_data", force: true do |t|
+    t.string   "key",        limit: 40
+    t.string   "value",      limit: 6
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  add_index "simple_captcha_data", ["key"], :name => "idx_key"
+  add_index "simple_captcha_data", ["key"], name: "idx_key", using: :btree
 
-  create_table "tag_followings", :force => true do |t|
-    t.integer  "tag_id",     :null => false
-    t.integer  "user_id",    :null => false
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+  create_table "tag_followings", force: true do |t|
+    t.integer  "tag_id",     null: false
+    t.integer  "user_id",    null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  add_index "tag_followings", ["tag_id", "user_id"], :name => "index_tag_followings_on_tag_id_and_user_id", :unique => true
-  add_index "tag_followings", ["tag_id"], :name => "index_tag_followings_on_tag_id"
-  add_index "tag_followings", ["user_id"], :name => "index_tag_followings_on_user_id"
+  add_index "tag_followings", ["tag_id", "user_id"], name: "index_tag_followings_on_tag_id_and_user_id", unique: true, using: :btree
+  add_index "tag_followings", ["tag_id"], name: "index_tag_followings_on_tag_id", using: :btree
+  add_index "tag_followings", ["user_id"], name: "index_tag_followings_on_user_id", using: :btree
 
-  create_table "taggings", :force => true do |t|
+  create_table "taggings", force: true do |t|
     t.integer  "tag_id"
     t.integer  "taggable_id"
-    t.string   "taggable_type", :limit => 127
+    t.string   "taggable_type", limit: 127
     t.integer  "tagger_id"
-    t.string   "tagger_type",   :limit => 127
-    t.string   "context",       :limit => 127
+    t.string   "tagger_type",   limit: 127
+    t.string   "context",       limit: 127
     t.datetime "created_at"
   end
 
-  add_index "taggings", ["created_at"], :name => "index_taggings_on_created_at"
-  add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
-  add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
-  add_index "taggings", ["taggable_id", "taggable_type", "tag_id"], :name => "index_taggings_uniquely", :unique => true
+  add_index "taggings", ["created_at"], name: "index_taggings_on_created_at", using: :btree
+  add_index "taggings", ["tag_id"], name: "index_taggings_on_tag_id", using: :btree
+  add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context", using: :btree
+  add_index "taggings", ["taggable_id", "taggable_type", "tag_id"], name: "index_taggings_uniquely", unique: true, using: :btree
 
-  create_table "tags", :force => true do |t|
+  create_table "tags", force: true do |t|
     t.string  "name"
-    t.integer "taggings_count", :default => 0
+    t.integer "taggings_count", default: 0
   end
 
-  add_index "tags", ["name"], :name => "index_tags_on_name", :unique => true
+  add_index "tags", ["name"], name: "index_tags_on_name", unique: true, using: :btree
 
-  create_table "user_preferences", :force => true do |t|
+  create_table "user_preferences", force: true do |t|
     t.string   "email_type"
     t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "users", :force => true do |t|
+  create_table "users", force: true do |t|
     t.string   "username"
     t.text     "serialized_private_key"
-    t.boolean  "getting_started",                                   :default => true,  :null => false
-    t.boolean  "disable_mail",                                      :default => false, :null => false
+    t.boolean  "getting_started",                                default: true,  null: false
+    t.boolean  "disable_mail",                                   default: false, null: false
     t.string   "language"
-    t.string   "email",                                             :default => "",    :null => false
-    t.string   "encrypted_password",                                :default => "",    :null => false
-    t.string   "invitation_token",                   :limit => 60
+    t.string   "email",                                          default: "",    null: false
+    t.string   "encrypted_password",                             default: "",    null: false
+    t.string   "invitation_token",                   limit: 60
     t.datetime "invitation_sent_at"
     t.string   "reset_password_token"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",                                     :default => 0
+    t.integer  "sign_in_count",                                  default: 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
     t.string   "last_sign_in_ip"
-    t.datetime "created_at",                                                           :null => false
-    t.datetime "updated_at",                                                           :null => false
-    t.string   "invitation_service",                 :limit => 127
-    t.string   "invitation_identifier",              :limit => 127
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "invitation_service",                 limit: 127
+    t.string   "invitation_identifier",              limit: 127
     t.integer  "invitation_limit"
     t.integer  "invited_by_id"
     t.string   "invited_by_type"
-    t.string   "authentication_token",               :limit => 30
+    t.string   "authentication_token",               limit: 30
     t.string   "unconfirmed_email"
-    t.string   "confirm_email_token",                :limit => 30
+    t.string   "confirm_email_token",                limit: 30
     t.datetime "locked_at"
-    t.boolean  "show_community_spotlight_in_stream",                :default => true,  :null => false
-    t.boolean  "auto_follow_back",                                  :default => false
+    t.boolean  "show_community_spotlight_in_stream",             default: true,  null: false
+    t.boolean  "auto_follow_back",                               default: false
     t.integer  "auto_follow_back_aspect_id"
     t.text     "hidden_shareables"
     t.datetime "reset_password_sent_at"
     t.datetime "last_seen"
   end
 
-  add_index "users", ["authentication_token"], :name => "index_users_on_authentication_token", :unique => true
-  add_index "users", ["email"], :name => "index_users_on_email"
-  add_index "users", ["invitation_service", "invitation_identifier"], :name => "index_users_on_invitation_service_and_invitation_identifier", :unique => true
-  add_index "users", ["invitation_token"], :name => "index_users_on_invitation_token"
-  add_index "users", ["username"], :name => "index_users_on_username", :unique => true
+  add_index "users", ["authentication_token"], name: "index_users_on_authentication_token", unique: true, using: :btree
+  add_index "users", ["email"], name: "index_users_on_email", using: :btree
+  add_index "users", ["invitation_service", "invitation_identifier"], name: "index_users_on_invitation_service_and_invitation_identifier", unique: true, using: :btree
+  add_index "users", ["invitation_token"], name: "index_users_on_invitation_token", using: :btree
+  add_index "users", ["username"], name: "index_users_on_username", unique: true, using: :btree
 
   add_foreign_key "aspect_memberships", "aspects", name: "aspect_memberships_aspect_id_fk", dependent: :delete
   add_foreign_key "aspect_memberships", "contacts", name: "aspect_memberships_contact_id_fk", dependent: :delete
diff --git a/lib/account_deleter.rb b/lib/account_deleter.rb
index 3d869ea8a..6e52aeaf3 100644
--- a/lib/account_deleter.rb
+++ b/lib/account_deleter.rb
@@ -39,6 +39,8 @@ class AccountDeleter
         disconnect_contacts
         tombstone_user
       end
+
+      mark_account_deletion_complete
     end
   end
 
@@ -111,4 +113,8 @@ class AccountDeleter
   def ignored_or_special_ar_person_associations
     [:comments, :contacts, :notification_actors, :notifications, :owner, :profile, :conversation_visibilities]
   end
+
+  def mark_account_deletion_complete
+    AccountDeletion.where(:diaspora_handle => self.person.diaspora_handle).where(:person_id => self.person.id).update_all(["completed_at = ?", Time.now])
+  end
 end
diff --git a/lib/tasks/accounts.rake b/lib/tasks/accounts.rake
index 91bfd7a02..fb79a2730 100644
--- a/lib/tasks/accounts.rake
+++ b/lib/tasks/accounts.rake
@@ -1,9 +1,9 @@
 namespace :accounts do
   desc "Run deletions"
   task :run_deletions => :environment do
-    if ::AccountDeletion.count > 0
+    if ::AccountDeletion.uncompleted.count > 0
       puts "Running account deletions.."
-      ::AccountDeletion.find_each do |account_delete|
+      ::AccountDeletion.uncompleted.find_each do |account_delete|
         account_delete.perform!
       end
       puts "OK."
diff --git a/spec/models/account_deletion_spec.rb b/spec/models/account_deletion_spec.rb
index 9515e3794..e1c1cf4f8 100644
--- a/spec/models/account_deletion_spec.rb
+++ b/spec/models/account_deletion_spec.rb
@@ -32,10 +32,16 @@ describe AccountDeletion do
     end
 
     it 'does not dispatch an account deletion for non-local people' do
-      deletion =  AccountDeletion.new(:person => remote_raphael)
+      deletion = AccountDeletion.new(:person => remote_raphael)
       deletion.should_not_receive(:dispatch)
       deletion.perform!
     end
+
+    it 'marks an AccountDeletion as completed when successful' do
+      ad = AccountDeletion.create(:person => alice.person)
+      ad.perform!
+      ad.reload.completed_at.should_not be_nil
+    end
   end
 
   describe '#dispatch' do