diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl
index a602a671a0..1ea51ffdb5 100644
--- a/templates/repo/diff/box.tmpl
+++ b/templates/repo/diff/box.tmpl
@@ -8,7 +8,9 @@
 			<div class="ui right">
 				<a class="ui tiny basic toggle button" href="?style={{if .IsSplitStyle}}unified{{else}}split{{end}}">{{ if .IsSplitStyle }}{{.i18n.Tr "repo.diff.show_unified_view"}}{{else}}{{.i18n.Tr "repo.diff.show_split_view"}}{{end}}</a>
 				<a class="ui tiny basic toggle button" data-target="#diff-files">{{.i18n.Tr "repo.diff.show_diff_stats"}}</a>
-				{{template "repo/diff/new_review" .}}
+				{{if .IsSigned}}
+					{{template "repo/diff/new_review" .}}
+				{{end}}
 			</div>
 		</div>
 		<ol class="detail-files hide" id="diff-files">
@@ -104,7 +106,7 @@
 
 														</td>
 														<td class="lines-code lines-code-old halfwidth">
-															{{if not (len $line.Comments)}}
+															{{if and $.IsSigned (not (len $line.Comments))}}
 																<a class="ui green button add-code-comment add-code-comment-right" data-path="{{$file.Name}}" data-side="right" data-idx="{{$line.RightIdx}}">+</a>
 															{{end}}
 															<pre><code class="wrap {{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{if $line.LeftIdx}}{{$section.GetComputedInlineDiffFor $line}}{{end}}</code></pre>
@@ -114,7 +116,7 @@
 														</td>
 
 														<td class="lines-code lines-code-new halfwidth">
-															{{if not (len $line.Comments)}}
+															{{if and $.IsSigned (not (len $line.Comments))}}
 																<a class="ui green button add-code-comment add-code-comment-right" data-path="{{$file.Name}}" data-side="right" data-idx="{{$line.RightIdx}}">+</a>
 															{{end}}
 															<pre><code class="wrap {{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{if $line.RightIdx}}{{$section.GetComputedInlineDiffFor $line}}{{end}}</code></pre>
@@ -129,7 +131,12 @@
 																		{{ template "repo/diff/comments" dict "root" $ "comments" $line.Comments}}
 																		</ui>
 																	</div>
-																{{template "repo/diff/comment_form_datahandler" dict "root" $ "comment" (index $line.Comments 0)}}
+																	{{if $.IsSigned}}
+																		{{template "repo/diff/comment_form_datahandler" dict "root" $ "comment" (index $line.Comments 0)}}
+																	{{end}}
+																	{{printf "%v" $}}
+																	<hr>
+																	{{printf "%v" $.IsSigned}}
 																</div>
 															</td>
 														</tr>
diff --git a/templates/repo/diff/section_unified.tmpl b/templates/repo/diff/section_unified.tmpl
index 8db154bd57..23cb296705 100644
--- a/templates/repo/diff/section_unified.tmpl
+++ b/templates/repo/diff/section_unified.tmpl
@@ -16,7 +16,7 @@
 			</td>
 			{{end}}
 			<td class="lines-code {{if (not $line.RightIdx)}}lines-code-old{{end}}">
-				{{if not (len $line.Comments)}}
+				{{if and $.IsSigned (not (len $line.Comments))}}
 					<a class="ui green button add-code-comment add-code-comment-{{if $line.RightIdx}}right{{else}}left{{end}}" data-path="{{$file.Name}}" data-side="{{if $line.RightIdx}}right{{else}}left{{end}}" data-idx="{{if $line.RightIdx}}{{$line.RightIdx}}{{else}}{{$line.LeftIdx}}{{end}}">+</a>
 				{{end}}
 				<pre><code class="wrap {{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{$section.GetComputedInlineDiffFor $line}}</code></pre>
@@ -31,7 +31,9 @@
 						{{ template "repo/diff/comments" dict "root" $.root "comments" $line.Comments}}
 						</ui>
 					</div>
-				{{template "repo/diff/comment_form_datahandler" dict "root" $.root "comment" (index $line.Comments 0)}}
+					{{if $.IsSigned}}
+						{{template "repo/diff/comment_form_datahandler" dict "root" $.root "comment" (index $line.Comments 0)}}
+					{{end}}
 				</div>
 			</td>
 		</tr>