diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 67b57f802..b4c2a6dce 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -5,6 +5,9 @@
 <%= delete_link user_path(@user) if User.current != @user %>
 </div>
 
-<%= title [l(:label_user_plural), users_path], @user.login %>
+<%=
+  page_title = title [l(:label_user_plural), users_path], @user.login
+  page_title.insert(page_title.rindex(' ') + 1, avatar(@user, :size => "24"))
+%>
 
 <%= render_tabs user_settings_tabs %>
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index d1fdd2150..2798c023d 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -420,8 +420,11 @@ class UsersControllerTest < Redmine::ControllerTest
 
 
   def test_edit
-    get :edit, :params => {:id => 2}
+    with_settings :gravatar_enabled => '1' do
+      get :edit, :params => {:id => 2}
+    end
     assert_response :success
+    assert_select 'h2>a+img.gravatar'
     assert_select 'input[name=?][value=?]', 'user[login]', 'jsmith'
   end