diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 58ec06f8c9..13f801b796 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -41,8 +41,6 @@ def user_avatar_size_name_for_2x(size)
   end
 
   def user_avatar_tag(user, size = :normal, opts = {})
-    link = opts[:link].nil? ? true : opts[:link]
-
     width = user_avatar_width_for_size(size)
     img_class = "media-object avatar-#{width}"
 
@@ -53,12 +51,14 @@ def user_avatar_tag(user, size = :normal, opts = {})
 
     img =
       if user.avatar?
-        image_tag(user.avatar.url(user_avatar_size_name_for_2x(size)), class: img_class)
+        image_url = user.avatar.url(user_avatar_size_name_for_2x(size))
+        image_url += "?t=#{user.updated_at.to_i}" if opts[:timestamp]
+        image_tag(image_url, class: img_class)
       else
         image_tag(user.letter_avatar_url(width * 2), class: img_class)
       end
 
-    if link
+    if opts[:link] != false
       link_to(raw(img), user_path(user))
     else
       raw img
diff --git a/app/views/account/edit.html.erb b/app/views/account/edit.html.erb
index fca7b7f26b..f457d68ebc 100644
--- a/app/views/account/edit.html.erb
+++ b/app/views/account/edit.html.erb
@@ -57,7 +57,7 @@
   <div class="sidebar col-md-3">
     <div class="panel panel-default" style="text-align:center;">
       <div class="panel-body">
-        <%= user_avatar_tag(@user, :large, link: false) %>
+        <%= user_avatar_tag(@user, :large, link: false, timestamp: true) %>
       </div>
     </div>
     <div class="panel panel-default">
diff --git a/spec/helpers/users_helper_spec.rb b/spec/helpers/users_helper_spec.rb
index a64c14bc68..c3acb97688 100644
--- a/spec/helpers/users_helper_spec.rb
+++ b/spec/helpers/users_helper_spec.rb
@@ -27,6 +27,43 @@
     end
   end
 
+  describe 'user_avatar_tag' do 
+    it "should work if user not exist" do 
+      user_avatar_tag(nil).should eq image_tag("avatar/normal.png", class: "media-object avatar-48")
+    end
+
+    it "should work if user exists" do 
+      user = create(:user)
+      img = image_tag(user.letter_avatar_url(96), class: "media-object avatar-48")
+      user_avatar_tag(user).should eq link_to(raw(img), user_path(user))
+    end
+
+    it "should work if avatar exist" do 
+      user = create(:avatar_user)
+      image_url = user.avatar.url(user_avatar_size_name_for_2x(:normal))
+      img = image_tag(image_url, class: "media-object avatar-48")
+      user_avatar_tag(user).should eq link_to(raw(img), user_path(user)) 
+    end
+
+    it "should work with defferent size" do 
+      user_avatar_tag(nil, :large).should eq image_tag("avatar/large.png", class: "media-object avatar-96")
+    end
+
+    it "should work with timestamp param" do 
+      user = create(:avatar_user)
+      image_url = user.avatar.url(user_avatar_size_name_for_2x(:normal)) + "?t=#{user.updated_at.to_i}"
+      img = image_tag(image_url, class: "media-object avatar-48")
+      user_avatar_tag(user, :normal, timestamp: true).should eq link_to(raw(img), user_path(user)) 
+    end
+
+    it "should work if link is false" do 
+      user = create(:avatar_user)
+      image_url = user.avatar.url(user_avatar_size_name_for_2x(:normal)) + "?t=#{user.updated_at.to_i}"
+      img = image_tag(image_url, class: "media-object avatar-48")
+      user_avatar_tag(user, :normal, timestamp: true, link: false).should eq img 
+    end
+  end
+
   describe '.render_user_level_tag' do
     let(:user) { create(:user) }
     subject { helper.render_user_level_tag(user) }