1 files changed, 3 insertions, 3 deletions
diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb
index 8ba6a7b..5c6767c 100644
--- a/users/app/controllers/users_controller.rb
+++ b/users/app/controllers/users_controller.rb
@@ -27,16 +27,16 @@ class UsersController < ApplicationController
   end
 
   def edit
+    @email_alias = LocalEmail.new
   end
 
   def update
     @user.attributes = params[:user]
+    @email_alias = @user.email_aliases.last
     if @user.changed? and @user.save
       flash[:notice] = t(:user_updated_successfully)
-    else
-      flash.now[:error] = @user.errors.full_messages.to_sentence
     end
-    respond_with @user.reload, :location => edit_user_path(@user, :anchor => :email)
+    respond_with @user, :location => edit_user_path(@user, :anchor => :email)
   end
 
   def destroy