diff --git a/app/controllers/spree/admin/users_controller.rb b/app/controllers/spree/admin/users_controller.rb
index 17ab1d041d..b2c91611df 100644
--- a/app/controllers/spree/admin/users_controller.rb
+++ b/app/controllers/spree/admin/users_controller.rb
@@ -46,7 +46,11 @@ module Spree
             @user.spree_roles = roles.reject(&:blank?).collect{ |r| Spree::Role.find(r) }
           end
 
-          flash.now[:success] = Spree.t(:account_updated)
+          if params[:user][:email] != @user.email
+            flash.now[:success] = Spree.t(:email_updated)
+          else
+            flash.now[:success] = Spree.t(:account_updated)
+          end
         end
         render :edit
       end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9348cd9138..b595cb9da0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2943,6 +2943,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
     email: Email
     # TODO: remove 'account_updated' key once we get to Spree 2.0
     account_updated: "Account updated!"
+    email_updated: "The account will be updated once the new email is confirmed."
     my_account: "My account"
     date: "Date"
     time: "Time"