diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index 3feb4f9e0..aeb9aaa70 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -237,6 +237,7 @@ Danbooru.Note = {
         })
       } else {
         $note_body.click(function(e) {
+          Danbooru.notice("You must be logged in to edit notes");
           e.stopPropagation();
         });
       }
diff --git a/app/views/comments/partials/show/_comment.html.erb b/app/views/comments/partials/show/_comment.html.erb
index 96f9801f2..be178e30e 100644
--- a/app/views/comments/partials/show/_comment.html.erb
+++ b/app/views/comments/partials/show/_comment.html.erb
@@ -13,17 +13,20 @@
         <p class="info">Updated by <%= link_to comment.updater_name, user_path(comment.updater_id) %> <%= time_ago_in_words_tagged(comment.updated_at) %></p>
       <% end %>
     </div>
-    <menu>
-      <% if @post || @posts %>
-        <li><%= link_to "Reply", new_comment_path(:post_id => comment.post_id), :class => "reply-link", "data-comment-id" => comment.id %></li>
-        <% if comment.editable_by?(CurrentUser.user) %>
-          <li><%= link_to "Delete", comment_path(comment.id), :confirm => "Do you really want to delete this comment?", :method => :delete, :remote => true %></li>
-          <li><%= link_to "Edit", edit_comment_path(comment.id) %></li>
+    
+    <% if CurrentUser.is_member? %>
+      <menu>
+        <% if @post || @posts %>
+          <li><%= link_to "Reply", new_comment_path(:post_id => comment.post_id), :class => "reply-link", "data-comment-id" => comment.id %></li>
+          <% if comment.editable_by?(CurrentUser.user) %>
+            <li><%= link_to "Delete", comment_path(comment.id), :confirm => "Do you really want to delete this comment?", :method => :delete, :remote => true %></li>
+            <li><%= link_to "Edit", edit_comment_path(comment.id) %></li>
+          <% end %>
+          <li id="comment-vote-up-link-for-<%= comment.id %>"><%= link_to "Vote up", comment_votes_path(:comment_id => comment.id, :score => "up"), :method => :post, :remote => true %></li>
+          <li id="comment-vote-down-link-for-<%= comment.id %>"><%= link_to "Vote down", comment_votes_path(:comment_id => comment.id, :score => "down"), :method => :post, :remote => true %></li>
         <% end %>
-        <li id="comment-vote-up-link-for-<%= comment.id %>"><%= link_to "Vote up", comment_votes_path(:comment_id => comment.id, :score => "up"), :method => :post, :remote => true %></li>
-        <li id="comment-vote-down-link-for-<%= comment.id %>"><%= link_to "Vote down", comment_votes_path(:comment_id => comment.id, :score => "down"), :method => :post, :remote => true %></li>
-      <% end %>
-    </menu>
+      </menu>
+    <% end %>
   </div>
   <div class="clearfix"></div>
 </article>