diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
index 663a955f..2b4f9e28 100644
--- a/app/controllers/activities_controller.rb
+++ b/app/controllers/activities_controller.rb
@@ -18,7 +18,7 @@ def index
         includes(:user).
         order('id DESC').
         limit(Kandan::Config.options[:per_page])
-    end  
+    end
 
     first_activity = Activity.order('id').where(:channel_id => params[:channel_id]).first
     first_activity_id = first_activity.id if not first_activity.nil?
diff --git a/app/models/user.rb b/app/models/user.rb
index fc8542af..512c5792 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -15,6 +15,7 @@ def bushido_extra_attributes(extra_attributes)
     self.first_name = extra_attributes["first_name"].to_s
     self.last_name  = extra_attributes["last_name"].to_s
     self.email      = extra_attributes["email"]
+    self.locale     = extra_attributes["locale"]
   end
 
   def ensure_gravatar_hash