diff --git a/.rubocop.yml b/.rubocop.yml
index c63b76e90..8b87da99b 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -367,9 +367,15 @@ Security/JSONLoad:
 Security/YAMLLoad:
   Enabled: true
 
+Style/AndOr:
+  Enabled: true
+
 Style/BlockDelimiters:
   Enabled: true
 
+Style/Not:
+  Enabled: true
+
 Style/PercentLiteralDelimiters:
   Enabled: true
 
diff --git a/config/initializers/devise_security_extension.rb b/config/initializers/devise_security_extension.rb
index 51cf56429..8a86bb15d 100644
--- a/config/initializers/devise_security_extension.rb
+++ b/config/initializers/devise_security_extension.rb
@@ -62,7 +62,7 @@ module Devise
         if !self.new_record? && !self.encrypted_password_change.nil? && !self.erased?
           dummy = self.class.new
           dummy.encrypted_password = self.encrypted_password_change.first
-          dummy.password_salt = self.password_salt_change.first if self.respond_to? :password_salt_change and not self.password_salt_change.nil?
+          dummy.password_salt = self.password_salt_change.first if self.respond_to?(:password_salt_change) && !self.password_salt_change.nil?
           self.errors.add(:password, :equal_to_current_password) if dummy.valid_password?(self.password)
         end
       end