diff --git a/app/views/issues/_manage_sidebar.html.haml b/app/views/issues/_manage_sidebar.html.haml
index bd70ac04c..17a8ce1be 100644
--- a/app/views/issues/_manage_sidebar.html.haml
+++ b/app/views/issues/_manage_sidebar.html.haml
@@ -1,5 +1,5 @@
 -content_for :sidebar do
-  - can_manage = can? :write, @issue.project
+  - can_manage = can?(:update, @issue) && @issue.persisted? || can?(:create, @project.issues.new) && @issue.new_record?
   - if @issue.persisted?
     .bordered.nopadding
       %h3=t('activerecord.attributes.issue.status')
@@ -21,7 +21,7 @@
                 .name="#{@issue.user.uname} (#{@issue.user.name})"
                 =hidden_field_tag "user-0", @issue.user.id, :name => 'issue[user_id]'
                 .both
-      - else
+      - elsif @issue.user
         .people.nopointer
           .avatar=image_tag avatar_url(@issue.user), :alt => 'avatar'
           .name="#{@issue.user.uname} (#{@issue.user.name})"
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index d382b3279..97e39954e 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -16,7 +16,7 @@
   .fulltext.view.issue_body=@issue.body
 .both
 %br
-- if can? :write, @issue.project
+- if can? :update, @issue
   =link_to t('layout.edit'), '#', :id => 'edit_issue_content', :class => 'button'
   =form_for :issue, :url => [@project, @issue], :method => :put, :html => { :class => 'edit_form issue', :style => 'display:none;' } do |f|
     .leftlist= t('activerecord.attributes.issue.title') + ':'