diff --git a/pagure/templates/_render_issues.html b/pagure/templates/_render_issues.html
index 54a058b..9fb5383 100644
--- a/pagure/templates/_render_issues.html
+++ b/pagure/templates/_render_issues.html
@@ -14,7 +14,7 @@
                     <span class="font-weight-bold">
                         <a class="notblue" href="{{ url_for('ui_ns.view_issue',
                         repo=repo.name,
-                        username=username,
+                        username=repo.username if repo.is_fork else None,
                         namespace=repo.namespace,
                         issueid=issue.id) }}">
                         {{issue.title}}
@@ -39,7 +39,7 @@
                                   class="badge badge-secondary"
                                   href="{{ url_for('ui_ns.view_issues',
                                       repo=repo.name,
-                                      username=username,
+                                      username=repo.username if repo.is_fork else None,
                                       namespace=repo.namespace,
                                       tags=tag.tag) }}">
                                 {{ tag.tag }}
@@ -68,4 +68,4 @@
             </span>
         </div>
     </div>
-{% endmacro%}
\ No newline at end of file
+{% endmacro%}
diff --git a/pagure/templates/repo_roadmap.html b/pagure/templates/repo_roadmap.html
index 8260f7c..0cccf0c 100644
--- a/pagure/templates/repo_roadmap.html
+++ b/pagure/templates/repo_roadmap.html
@@ -35,7 +35,7 @@
                             %}btn-primary{% else %}btn-outline-primary{% endif %}"
                                href="{{ url_for('ui_ns.view_roadmap',
                                      repo=repo.name,
-                                     username=username,
+                                     username=repo.username if repo.is_fork else None,
                                      namespace=repo.namespace,
                                     status='active') }}">
                                 <i class="fa fa-clock-o"></i>
@@ -45,7 +45,7 @@
                             %}btn-primary{% else %}btn-outline-primary{% endif %}"
                                href="{{ url_for('ui_ns.view_roadmap',
                                      repo=repo.name,
-                                     username=username,
+                                     username=repo.username if repo.is_fork else None,
                                      namespace=repo.namespace,
                                     status='inactive') }}">
                                 <i class="fa fa-check-circle"></i>
@@ -60,7 +60,7 @@
             <a href="{{ url_for(
                 'ui_ns.view_milestone',
                 repo=repo.name,
-                username=username,
+                username=repo.username if repo.is_fork else None,
                 namespace=repo.namespace,
                 milestone=milestone) }}"
                 class="list-group-item list-group-item-action">
diff --git a/pagure/templates/roadmap.html b/pagure/templates/roadmap.html
index 1ceefff..6f3c6f9 100644
--- a/pagure/templates/roadmap.html
+++ b/pagure/templates/roadmap.html
@@ -15,7 +15,7 @@
     <h4 class="font-weight-bold">
       <div class="row">
         <div class="col">
-           {{ title }} 
+           {{ title }}
           <span class="badge badge-secondary">{{ issues | length }} issues</span>
         </div>
       {% if milestone and milestone in repo.milestones and repo.milestones[milestone]['date'] %}
@@ -58,7 +58,7 @@
               <a {% if issue.status == 'Closed' %}class="text-muted"{% endif %} href="{{ url_for(
                   'ui_ns.view_issue',
                   repo=repo.name,
-                  username=username,
+                  username=repo.username if repo.is_fork else None,
                   namespace=repo.namespace,
                   issueid=issue.id) }}">
                 {{ issue.title | noJS("img") | safe }}
@@ -139,7 +139,7 @@
       <a href="{{ url_for(
             'ui_ns.view_settings',
             repo=repo.name,
-            username=username,
+            username=repo.username if repo.is_fork else None,
             namespace=repo.namespace) }}#roadmap-tab"
           class="btn btn-outline-primary">
           <i class="fa fa-cogs fa-fw"></i>
@@ -159,7 +159,7 @@
       else %}btn-outline-primary{%
       endif %} btn-sm" href="{{ url_for('ui_ns.view_roadmap',
         repo=repo.name,
-        username=username,
+        username=repo.username if repo.is_fork else None,
         namespace=repo.namespace,
         milestone=requested_stones,
         all_stones=all_stones,
@@ -169,7 +169,7 @@
       else %}btn-outline-primary{%
       endif %} btn-sm" href="{{ url_for('ui_ns.view_roadmap',
         repo=repo.name,
-        username=username,
+        username=repo.username if repo.is_fork else None,
         namespace=repo.namespace,
         tag=tags,
         milestone=requested_stones,
@@ -180,7 +180,7 @@
       else %}btn-outline-primary{%
       endif %} btn-sm" href="{{ url_for('ui_ns.view_roadmap',
         repo=repo.name,
-        username=username,
+        username=repo.username if repo.is_fork else None,
         namespace=repo.namespace,
         tag=tags,
         milestone=requested_stones,
@@ -194,7 +194,7 @@
       else %}btn-outline-primary{%
       endif %} btn-sm" href="{{ url_for('ui_ns.view_roadmap',
         repo=repo.name,
-        username=username,
+        username=repo.username if repo.is_fork else None,
         namespace=repo.namespace,
         tag=tags,
         status=status) }}" title="Only display active milestone tags">Active Milestones</a>
@@ -203,7 +203,7 @@
       else %}btn-outline-primary{%
       endif %} btn-sm" href="{{ url_for('ui_ns.view_roadmap',
         repo=repo.name,
-        username=username,
+        username=repo.username if repo.is_fork else None,
         namespace=repo.namespace,
         tag=tags,
         all_stones=true,
@@ -213,7 +213,7 @@
       else %}btn-outline-primary{%
       endif %} btn-sm" href="{{ url_for('ui_ns.view_roadmap',
         repo=repo.name,
-        username=username,
+        username=repo.username if repo.is_fork else None,
         namespace=repo.namespace,
         tag=tags,
         no_stones=true,
@@ -228,7 +228,7 @@
         href="{{ url_for(
           'ui_ns.view_roadmap',
           repo=repo.name,
-          username=username,
+          username=repo.username if repo.is_fork else None,
           namespace=repo.namespace,
           milestone=stone | add_or_remove(requested_stones[:]),
           tag=tags,
@@ -246,7 +246,7 @@
         <a class="btn btn-outline-primary btn-sm {% if tag in tags %}active{% endif %}"
           href="{{ url_for('ui_ns.view_roadmap',
               repo=repo.name,
-              username=username,
+              username=repo.username if repo.is_fork else None,
               namespace=repo.namespace,
               status=status,
               tag=tag | add_or_remove(tags[:]),
diff --git a/tests/test_pagure_flask_ui_roadmap.py b/tests/test_pagure_flask_ui_roadmap.py
index a588be3..1f1a80c 100644
--- a/tests/test_pagure_flask_ui_roadmap.py
+++ b/tests/test_pagure_flask_ui_roadmap.py
@@ -570,6 +570,11 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
         self.assertIn(
             '<span class="fa fa-fw fa-exclamation-circle"></span> 0 Closed\n',
             output_text)
+        self.assertIn(
+            '<a class="notblue" href="/test/issue/2">', output_text)
+        self.assertEquals(
+            output_text.count('<a class="notblue" href="/test/issue/2">'),
+            1)
 
         # test the roadmap view for errors
         output = self.app.get('/foo/roadmap')