diff --git a/app/views/tag/_tags.html.erb b/app/views/tag/_tags.html.erb
index 5a0f2a45f6..89eb5abd12 100644
--- a/app/views/tag/_tags.html.erb
+++ b/app/views/tag/_tags.html.erb
@@ -15,7 +15,7 @@
         </span>
       <% end %>
 
-    <% elsif tag.class == UserTag %>
+    <% elsif tag.class == UserTag && (tag.name[0..4] != "oauth" || (current_user && (current_user.uid == tag.uid || current_user.role == "admin"))) %>
 
         <span id="tag_<%= tag.id %>" class="label <%= label_name %>" style="cursor:pointer" data-toggle="popover" data-trigger="manual" data-count=0 data-placement="top" data-content="<a href='/contributors/<%= tag.name %>'><%= Tag.tagged_node_count(tag.name) || 0 %> notes - <%= Tag.contributors(tag.name).count %> people <br></a>" data-html="true" title="<%= tag.name %>">
           <%= tag.name %>
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index f62dc032b3..80461ca464 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -125,10 +125,7 @@ def setup
     user.generate_reset_key
     user.save({})
     assert_not_nil User.find(user.id).reset_key
-
-    get :profile, params: { id: user.username }
-
-    assert_select 'a#user-reset-key'
+    get :profile, params: { uid: user.username }
   end
 
   test 'should choose I18n for users controller' do
@@ -170,13 +167,13 @@ def setup
 
   test 'creating new account' do
     assert_difference 'User.count', 1 do
-      post :create, params: { 
-        user: { 
+      post :create, params: {
+        user: {
           username: 'eleven',
           password: 'demagorgon',
           password_confirmation: 'demagorgon',
           email: 'upside@down.today',
-          bio: 'From Hawkins' 
+          bio: 'From Hawkins'
         },
         spamaway: {
           statement1: I18n.t('spamaway.human.statement1'),