diff --git a/app/views/layouts/_user_watch_btn.html.erb b/app/views/layouts/_user_watch_btn.html.erb
index 5f9c550b7..aeb8ee08f 100644
--- a/app/views/layouts/_user_watch_btn.html.erb
+++ b/app/views/layouts/_user_watch_btn.html.erb
@@ -1,7 +1,11 @@
 <% if User.current.logged?%>
-    <%if(target.watched_by?(User.current))%>
-        <%= link_to "",watch_path(:object_type=> 'user',:object_id=>target.id,:target_id=>target.id),:class => "homepageFollow", :method => "delete",:remote => "true", :title => "取消关注"%>
-    <% else %>
-        <%= link_to "",watch_path(:object_type=> 'user',:object_id=>target.id,:target_id=>target.id),:class => "homepageFollowCancel", :method => "post",:remote => "true", :title => "添加关注"%>
-    <% end %>
+    <% if User.current == target%>
+        <%= link_to("编辑资料", my_account_path, :class => "fl UsersEditBtn")%>
+    <% else%>
+        <%if(target.watched_by?(User.current))%>
+            <%= link_to "取消关注",watch_path(:object_type=> 'user',:object_id=>target.id,:target_id=>target.id),:class => "UsersApBtn", :method => "delete",:remote => "true", :title => "取消关注"%>
+        <% else %>
+            <%= link_to "添加关注",watch_path(:object_type=> 'user',:object_id=>target.id,:target_id=>target.id),:class => "UsersAttBtn", :method => "post",:remote => "true", :title => "添加关注"%>
+        <% end %>
+    <% end%>
 <% end %>
\ No newline at end of file
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 65323828e..6d049cee3 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -39,10 +39,6 @@
                   <a href="<%= url_for(:controller => 'my', :action => 'clear_user_avatar_temp') %>" data-remote="true" class="homepageEditProfileIcon"></a>
                 </div>
               </div>
-            <% else %>
-              <div id="watch_user_btn" class="none">
-                <%= render :partial => 'layouts/user_watch_btn', :locals => {:target => @user} %>
-              </div>
             <% end %>
           <% end%>
         </div>
@@ -57,9 +53,7 @@
           <p class="mb20 c_dark f14">
             <%= get_technical_title @user %>
           </p>
-          <%= link_to("编辑资料", my_account_path, :class => "fl UsersEditBtn") if is_current_user%>
-          <a href="javascript:void(0);" class="UsersAttBtn" style="display:none;">添加关注</a>
-          <a href="javascript:void(0);" class="UsersApBtn" style="display:none;">取消关注</a>
+          <%= render :partial => 'layouts/user_watch_btn', :locals => {:target => @user} %>
         </div>
         <div class="cl"></div>
         <div>