diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 0c5fd9e89..8b7bf6d02 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -169,6 +169,8 @@ class UsersController < ApplicationController
         format.api  { render_validation_errors(@user) }
       end
     end
+  rescue ::ActionController::RedirectBackError
+    redirect_to :controller => 'users', :action => 'edit', :id => @user
   end
 
   def destroy