diff --git a/Gemfile.lock b/Gemfile.lock
index 318356be..12f49b05 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -561,6 +561,3 @@ DEPENDENCIES
   web-console
   will_paginate
   will_paginate-bootstrap
-
-BUNDLED WITH
-   1.10.6
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index e7550cf9..f1a147bc 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -138,12 +138,12 @@ class UserController < ApplicationController
       if current_user.theme.save
         flash[:success] = 'Theme saved.'
       else
-        flash[:error] = 'Theme saving failed. ' + current_user.theme.errors.messages.values.flatten.join ' '
+        flash[:error] = 'Theme saving failed. ' + current_user.theme.errors.messages.values.flatten.join(' ')
       end
     elsif current_user.theme.update_attributes(update_attributes)
       flash[:success] = 'Theme saved.'
     else
-      flash[:error] = 'Theme saving failed. ' + current_user.theme.errors.messages.values.flatten.join ' '
+      flash[:error] = 'Theme saving failed. ' + current_user.theme.errors.messages.values.flatten.join(' ')
     end
     redirect_to edit_user_theme_path
   end