diff --git a/.rubocop.yml b/.rubocop.yml
index 3b38f64..d44d044 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -25,3 +25,6 @@ Style/IndentationConsistency:
 
 Style/AccessModifierIndentation:
   EnforcedStyle: outdent
+
+Style/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 9fc1a9a..345ea21 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -64,16 +64,6 @@ Style/AlignHash:
     - 'spec/controllers/problems_controller_spec.rb'
     - 'spec/models/problem_spec.rb'
 
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/AlignParameters:
-  Exclude:
-    - 'app/helpers/apps_helper.rb'
-    - 'app/models/app.rb'
-    - 'app/models/notification_services/gtalk_service.rb'
-    - 'config/initializers/devise.rb'
-
 # Offense count: 105
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
diff --git a/app/decorators/issue_tracker_field_decorator.rb b/app/decorators/issue_tracker_field_decorator.rb
index 118d0df..ca7efa6 100644
--- a/app/decorators/issue_tracker_field_decorator.rb
+++ b/app/decorators/issue_tracker_field_decorator.rb
@@ -13,8 +13,8 @@ class IssueTrackerFieldDecorator < Draper::Decorator
 
   def input(form, issue_tracker)
     form.send(input_field, key.to_s,
-              :placeholder => field_info[:placeholder],
-              :value => issue_tracker.options[key.to_s])
+      :placeholder => field_info[:placeholder],
+      :value => issue_tracker.options[key.to_s])
   end
 
   private def input_field
diff --git a/app/helpers/apps_helper.rb b/app/helpers/apps_helper.rb
index fc6827c..f8d163a 100644
--- a/app/helpers/apps_helper.rb
+++ b/app/helpers/apps_helper.rb
@@ -2,11 +2,11 @@ module AppsHelper
   def link_to_copy_attributes_from_other_app
     if App.count > 1
       html =  link_to('copy settings from another app', '#',
-                       :class => 'button copy_config')
+        :class => 'button copy_config')
       html << select("duplicate", "app",
-                     App.all.asc(:name).reject{|a| a == @app }.
-                     collect{|p| [ p.name, p.id ] }, {:include_blank => "[choose app]"},
-                     {:class => "choose_other_app", :style => "display: none;"})
+        App.all.asc(:name).reject{|a| a == @app }.
+        collect{|p| [ p.name, p.id ] }, {:include_blank => "[choose app]"},
+        {:class => "choose_other_app", :style => "display: none;"})
       return html
     end
   end
diff --git a/app/models/notification_services/gtalk_service.rb b/app/models/notification_services/gtalk_service.rb
index 8f84ee7..37b72ed 100644
--- a/app/models/notification_services/gtalk_service.rb
+++ b/app/models/notification_services/gtalk_service.rb
@@ -30,8 +30,8 @@ class NotificationServices::GtalkService < NotificationService
   def check_params
     if Fields.detect { |f| self[f[0]].blank? && self[f[2]].blank? } 
       errors.add :base, 
-      """You must specify your Username, Password, service, service_url 
-         and either rooms or users to send to or both"""
+        """You must specify your Username, Password, service, service_url 
+           and either rooms or users to send to or both"""
     end
   end
 
--
libgit2 0.21.2