diff --git a/app/controllers/projects/tags_controller.rb b/app/controllers/projects/tags_controller.rb
index f512f01dc787ccf0f2d0150fa5c68e9d7385202c..cb39c2b878283dba5663642c7da542caab4dcbea 100644
--- a/app/controllers/projects/tags_controller.rb
+++ b/app/controllers/projects/tags_controller.rb
@@ -19,7 +19,7 @@ class Projects::TagsController < Projects::ApplicationController
 
   def create
     result = CreateTagService.new(@project, current_user).
-      execute(params[:tag_name], params[:ref], params[:message])
+      execute(params[:tag_name], params[:ref], params[:message], params[:release_description])
 
     if result[:status] == :success
       @tag = result[:tag]
diff --git a/app/views/projects/releases/edit.html.haml b/app/views/projects/releases/edit.html.haml
index 787414163472947f37109a6a25a4f5bd6bbfdf77..e7db09cdaa9153b3ec8957ce0950fb8993b9b4c5 100644
--- a/app/views/projects/releases/edit.html.haml
+++ b/app/views/projects/releases/edit.html.haml
@@ -1,3 +1,4 @@
+- page_title "Edit", @tag.name, "Tags"
 = render "projects/commits/header_title"
 = render "projects/commits/head"
 
diff --git a/app/views/projects/tags/show.html.haml b/app/views/projects/tags/show.html.haml
index f95ae9edc4b3854c59a4e6957511c992e7837083..ebe3718afcc3bbf8cb55f80e5d4ce016c94fd09d 100644
--- a/app/views/projects/tags/show.html.haml
+++ b/app/views/projects/tags/show.html.haml
@@ -4,8 +4,9 @@
 
 .gray-content-block
   .pull-right
-    = link_to edit_namespace_project_tag_release_path(@project.namespace, @project, @tag.name), class: 'btn-grouped btn', title: 'Edit release notes' do
-      = icon("pencil")
+    - if can?(current_user, :push_code, @project)
+      = link_to edit_namespace_project_tag_release_path(@project.namespace, @project, @tag.name), class: 'btn-grouped btn', title: 'Edit release notes' do
+        = icon("pencil")
     = link_to namespace_project_tree_path(@project.namespace, @project, @tag.name), class: 'btn btn-grouped', title: 'Browse source code' do
       = icon('files-o')
     = link_to namespace_project_commits_path(@project.namespace, @project, @tag.name), class: 'btn btn-grouped', title: 'Browse commits' do
@@ -35,4 +36,4 @@
         = preserve do
           = markdown @release.description
   - else
-    This tag has no release notes yet. Press edit button to add one
+    This tag has no release notes.