diff --git a/mediagoblin/templates/mediagoblin/root.html b/mediagoblin/templates/mediagoblin/root.html
index e29abd51..5b744999 100644
--- a/mediagoblin/templates/mediagoblin/root.html
+++ b/mediagoblin/templates/mediagoblin/root.html
@@ -23,7 +23,6 @@
   {% if request.user %}
     <p>
       <a href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit an item</a> 
-      <a href="{{ request.urlgen('mediagoblin.edit.profile') }}">Edit profile</a>
     </p>
   {% else %}
     <p>
diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index 99e46a72..22defcbd 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@ -27,6 +27,10 @@
 {% block mediagoblin_content -%}
   {% if user %}
     <h1>{{ user.username }}'s profile</h1>
+    {% if request.user == user.username or request.user['is_admin'] %}
+       <a href="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{ 
+           user.username }}"> Edit</a>
+    {% endif %}
     
     {% include "mediagoblin/utils/profile.html" %}