diff --git a/Gemfile b/Gemfile
index 8c9ffac942bee085c733cbdbd4a27736da8202f8..6a1a0874c7ef95d41055fe67a3c7d217e17639cb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -65,6 +65,11 @@ gem 'redcarpet',      '3.0.0'
 gem 'roxml',          '3.1.6'
 gem 'ruby-oembed',    '0.8.8'
 
+
+#Rails 4 integration
+gem 'strong_parameters'
+
+
 # Services
 
 gem 'omniauth',          '1.1.4'
diff --git a/config/application.rb b/config/application.rb
index d061da7642db36095d6665d304fdbea83d8dbad3..ee781069e353cb7497ec3fbadb8aba24205c78ba 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -49,7 +49,7 @@ module Diaspora
     # This will create an empty whitelist of attributes available for mass-assignment for all models
     # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
     # parameters by using an attr_accessible or attr_protected declaration.
-    #config.active_record.whitelist_attributes = true
+    #config.active_record.whitelist_attributes = false
 
     # Enable the asset pipeline
     config.assets.enabled = true
diff --git a/config/initializers/strong_parameters.rb b/config/initializers/strong_parameters.rb
new file mode 100644
index 0000000000000000000000000000000000000000..394c1f5fd4296bc114794b892a532de8cedf2aa0
--- /dev/null
+++ b/config/initializers/strong_parameters.rb
@@ -0,0 +1 @@
+ActiveRecord::Base.send(:include, ActiveModel::ForbiddenAttributesProtection)