diff --git a/app/views/comment/_comment.rhtml b/app/views/comment/_comment.rhtml
index 9a2d4c4..82cf2c3 100644
--- a/app/views/comment/_comment.rhtml
+++ b/app/views/comment/_comment.rhtml
@@ -55,7 +55,7 @@
 
       <% if comment.spam? %>
         &nbsp;
-        <%= link_to_function(_('Mark as NOT SPAM'), 'remove_comment(this, %s); return false;' % url_for(:mark_comment_as_ham => comment.id).to_json, :class => 'comment-footer comment-footer-link comment-footer-hide')  %>
+        <%= link_to_function(_('Mark as NOT SPAM'), 'remove_comment(this, %s); return false;' % url_for(:profile => profile.identifier, :mark_comment_as_ham => comment.id).to_json, :class => 'comment-footer comment-footer-link comment-footer-hide')  %>
       <% else %>
         <% if (logged_in? && (user == profile || user.has_permission?(:moderate_comments, profile))) %>
           &nbsp;
@@ -65,12 +65,12 @@
 
       <% if comment.author && comment.author == user %>
         &nbsp;
-        <%= expirable_comment_link comment, :edit, _('Edit'), url_for(:controller => :comment, :action => :edit, :id => comment.id),:class => 'colorbox' %>
+        <%= expirable_comment_link comment, :edit, _('Edit'), url_for(:profile => profile.identifier, :controller => :comment, :action => :edit, :id => comment.id),:class => 'colorbox' %>
       <% end %>
 
       <% if logged_in? && (user == profile || user == comment.author || user.has_permission?(:moderate_comments, profile)) %>
         &nbsp;
-        <%= link_to_function(_('Remove'), 'remove_comment(this, %s, %s); return false ;' % [url_for(:controller => 'comment', :action => :destroy, :id => comment.id).to_json, _('Are you sure you want to remove this comment and all its replies?').to_json], :class => 'comment-footer comment-footer-link comment-footer-hide remove-children') %>
+        <%= link_to_function(_('Remove'), 'remove_comment(this, %s, %s); return false ;' % [url_for(:profile => profile.identifier, :controller => 'comment', :action => :destroy, :id => comment.id).to_json, _('Are you sure you want to remove this comment and all its replies?').to_json], :class => 'comment-footer comment-footer-link comment-footer-hide remove-children') %>
       <% end %>
 
       <% unless comment.spam? %>
--
libgit2 0.21.2