diff --git a/lib/devise_security_extension/models/password_archivable.rb b/lib/devise_security_extension/models/password_archivable.rb
index <HASH>..<HASH> 100644
--- a/lib/devise_security_extension/models/password_archivable.rb
+++ b/lib/devise_security_extension/models/password_archivable.rb
@@ -9,7 +9,7 @@ module Devise # :nodoc:
 
         base.class_eval do
           include InstanceMethods
-          has_many :old_passwords, :as => :password_archivable, :class_name => "OldPassword"
+          has_many :old_passwords, :as => :password_archivable, :dependent => :destroy
           before_update :archive_password
           validate :validate_password_archive
         end
Added dependent destroy on the old passwords to help clean up the old password table for users that were removed.