diff --git a/templates/repo/header/watch.tmpl b/templates/repo/header/watch.tmpl
index df6b716d0e..4a9b965cb6 100644
--- a/templates/repo/header/watch.tmpl
+++ b/templates/repo/header/watch.tmpl
@@ -1,25 +1,25 @@
 <div class="ui buttons" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.watch_guest_user"}}"{{end}}>
 	{{$buttonText := ctx.Locale.Tr "repo.watch"}}
 	{{if $.IsWatchingRepo}}{{$buttonText = ctx.Locale.Tr "repo.unwatch"}}{{end}}
-	<button type="button" class="ui basic compact small button" aria-label="{{$buttonText}}"
+	<a role="button" class="ui compact small basic button" aria-label="{{$buttonText}}"
 		{{if $.IsSigned}}
 			data-fetch-method="post"
 			data-fetch-url="{{$.RepoLink}}/action/{{if $.IsWatchingRepo}}unwatch{{else}}watch{{end}}"
 			data-fetch-sync="$closest(.ui.buttons)"
 		{{else}}
-			disabled
+			href="{{AppSubUrl}}/user/login"
 		{{end}}
 	>
 		{{svg "octicon-eye"}}
 		<span class="not-mobile" aria-hidden="true">{{$buttonText}}</span>
-	</button>
-	<a class="ui basic compact small button watch-label" href="{{.RepoLink}}/watchers">
+	</a>
+	<a class="ui basic compact small button watch-label" href="{{$.RepoLink}}/watchers">
 		{{CountFmt .Repository.NumWatches}}
 	</a>
 	{{if $.IsWatchingRepo}}
 	<a class="ui basic compact small button watch-icon"
 		data-global-init="initWatchOptions"
-		data-repo-link="{{.RepoLink}}"
+		data-repo-link="{{$.RepoLink}}"
 		data-watch-pull-requests="{{$.Watch.PullRequests}}"
 		data-watch-issues="{{$.Watch.Issues}}"
 		data-watch-releases="{{$.Watch.Releases}}"