diff --git a/templates/index.html b/templates/index.html
index 5b3b46ad..627477aa 100755
--- a/templates/index.html
+++ b/templates/index.html
@@ -5,11 +5,11 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
-	<title>{{if Sukebei}}Sukebei{{else}}Nyaa{{end}} Pantsu - {{block "title" .}}{{ call $.T "error_404" }}{{end}}</title>
+    <title>{{if Sukebei}}Sukebei{{else}}Nyaa{{end}} Pantsu - {{block "title" .}}{{ call $.T "error_404" }}{{end}}</title>
     <link rel="icon" type="image/png" href="/img/favicon.png?v=3" />
 
     <!-- RSS Feed with Context -->
-    <link href="{{ genRouteWithQuery "feed" .URL }}" rel="alternate" type="application/rss+xml" title="Nyaa Pantsu - {{block "rsstitle" .}}Last torrents{{end}} RSS Feed" />
+    <link href="{{ block "rss_link" . }}{{ genRouteWithQuery "feed" .URL }}{{end}}" rel="alternate" type="application/rss+xml" title="Nyaa Pantsu - {{block "rsstitle" .}}Last torrents{{end}} RSS Feed" />
 
     <!-- Bootstrap -->
     <!-- Latest compiled and minified CSS -->
@@ -51,7 +51,7 @@
  		<ul class="nav navbar-nav">
                       <li><a href="{{.URL.Parse "/upload"}}"><div class="hidden-md hidden-sm">{{call $.T "upload"}}</div><span class="glyphicon glyphicon-cloud-upload visible-md"></span></a></li>
                       <li><a href="{{.URL.Parse "/faq"}}"><div class="hidden-md hidden-sm">{{call $.T "faq"}}</div><span class="glyphicon glyphicon-question-sign visible-md"></span></a></li>
-                      <li><a href="{{ genRouteWithQuery "feed" .URL }}"><div class="hidden-md hidden-sm">RSS</div><span class="glyphicon glyphicon-flash visible-md"></span></a></li>
+                      <li><a href="{{ template "rss_link" . }}"><div class="hidden-md hidden-sm">RSS</div><span class="glyphicon glyphicon-flash visible-md"></span></a></li>
                       {{ if Sukebei }}
                       <li><a href="https://nyaa.pantsu.cat"><div class="hidden-md hidden-sm">{{call $.T "fun"}}</div><span class="glyphicon glyphicon-eye-open visible-md"></span></a></li>
                       {{ else }}
diff --git a/templates/user/profile.html b/templates/user/profile.html
index 79ac23a6..f84bdc06 100755
--- a/templates/user/profile.html
+++ b/templates/user/profile.html
@@ -1,5 +1,7 @@
 {{define "title"}}{{ call $.T "profile_page" .UserProfile.Username }}{{end}}
 {{define "contclass"}}cont-view{{end}}
+{{define "rss_link"}}{{ genRoute "feed_user" "id" ( print .UserProfile.ID ) "username" .UserProfile.Username }}{{end}}
+{{define "rsstitle" }}{{ .UserProfile.Username }}{{end}}
 {{define "content"}}
 {{ range (index $.FormInfos "infos")}}
 	<div class="alert alert-info"><a class="panel-close close" data-dismiss="alert">×</a><i class="glyphicon glyphicon-info-sign"></i> {{ . }}</div>
@@ -33,7 +35,6 @@
 									<a href="{{ genRoute "user_follow" "id" ( print .ID ) "username" .Username }}" class="btn btn-danger btn-sm">{{ call $.T "unfollow"}}</a>
 								{{end}}
 							{{end}}
-							<a href="{{ genRoute "feed_user" "id" ( print .ID ) "username" .Username }}" class="btn btn-warning btn-sm">RSS</a>
 						{{end}}
 					<!-- <button type="button" class="btn btn-danger btn-sm">Message</button> -->
 				</div>