diff --git a/progit/templates/commit.html b/progit/templates/commit.html
index 6925725..bedbc99 100644
--- a/progit/templates/commit.html
+++ b/progit/templates/commit.html
@@ -7,11 +7,12 @@
 {% block content %}
 
 <h2>
-  <a href="{{ url_for('view_repo', repo=repo)}}">
+  <a href="{{ url_for('view_repo', username=username, repo=repo)}}">
     {{ repo.split('.git')[0] }}
   </a>
 
-  (<a href="{{ url_for('view_tree', repo=repo, identifier=commitid) }}"
+  (<a href="{{ url_for('view_tree',
+               username=username, repo=repo, identifier=commitid) }}"
     >tree</a>)
 </h2>
 
@@ -36,7 +37,8 @@
     <td>Parent</td>
     <td>
       {% for parent in commit.parents %}
-      <a href="{{ url_for('view_commit', repo=repo, commitid=parent.oid.hex) }}">
+      <a href="{{ url_for('view_commit',
+                  username=username, repo=repo, commitid=parent.oid.hex) }}">
         {{ parent.oid.hex }}
       </a> <br />
       {% endfor %}
diff --git a/progit/templates/file.html b/progit/templates/file.html
index df69b08..6de946d 100644
--- a/progit/templates/file.html
+++ b/progit/templates/file.html
@@ -7,10 +7,12 @@
 {% block content %}
 
 <h2>
-  <a href="{{ url_for('view_repo', repo=repo)}}">
+  <a href="{{ url_for('view_repo',
+              username=username, repo=repo)}}">
     {{ repo.split('.git')[0] }}
   </a>
-  : <a href="{{ url_for('view_tree', repo=repo, identifier=branchname) }}">
+  : <a href="{{ url_for('view_tree',
+                username=username, repo=repo, identifier=branchname) }}">
   {{ branchname }}</a>/{%
   for file in filename.split('/') %}
     {% if loop.first %}
@@ -19,8 +21,9 @@
     {% set path = path + '/' + file %}
     {% endif %}
     {% if loop.index != loop.length %}
-<a href="{{ url_for('view_file', repo=repo, identifier=branchname,
-        filename=path)}}"
+<a href="{{ url_for('view_file',
+            username=username, repo=repo, identifier=branchname,
+            filename=path)}}"
       >{{ file }}</a>/{%
     else %}
 {{ file }}
@@ -42,6 +45,7 @@
       [ ]
       {% endif %}
       <a href="{{ url_for('view_file',
+                username=username,
                 repo=repo,
                 identifier=branchname,
                 filename=filename + '/' + entry.name if filename else entry.name) }}">
diff --git a/progit/templates/master.html b/progit/templates/master.html
index 3b45823..88f05a1 100644
--- a/progit/templates/master.html
+++ b/progit/templates/master.html
@@ -32,7 +32,7 @@
             <li id="homeTab"><a href="{{url_for('index')}}">Home</a></li>
             {% if g.fas_user %}
             <li id="myrepoTab">
-              <a href="{{ url_for('view_user', user=g.fas_user.username) }}">My repos</a>
+              <a href="{{ url_for('view_user', username=g.fas_user.username) }}">My repos</a>
             </li>
             {% endif %}
             {% if admin %}
@@ -44,7 +44,7 @@
         <span id="loginInfo">
           {% if g.fas_user %}
             <span class="text">logged in as </span>
-            <a href="{{ url_for('view_user', user=g.fas_user.username) }}">{{ g.fas_user.username }}</a> |
+            <a href="{{ url_for('view_user', username=g.fas_user.username) }}">{{ g.fas_user.username }}</a> |
             <a href="{{ url_for('auth_logout') }}?next={{request.url}}">log out</a>
           {% else %}
         <a href="{{ url_for('auth_login') }}?next={{request.url}}">login</a>
diff --git a/progit/templates/repo_info.html b/progit/templates/repo_info.html
index febb034..d896dad 100644
--- a/progit/templates/repo_info.html
+++ b/progit/templates/repo_info.html
@@ -6,7 +6,7 @@
 
 {% block content %}
 <h2>
-  <a href="{{ url_for('view_repo', repo=repo)}}">
+  <a href="{{ url_for('view_repo', username=username, repo=repo)}}">
     {{ repo.split('.git')[0] }}
   </a>
   {% if branchname %} ({{ branchname }}) {% endif %}
@@ -18,10 +18,12 @@
   <ul>
     {% for branch in branches %}
     <li>
-      <a href="{{ url_for('view_repo_branch', repo=repo, branchname=branch) }}">
+      <a href="{{ url_for('view_repo_branch',
+                  username=username, repo=repo, branchname=branch) }}">
         {{ branch }}
       </a>
-      (<a href="{{ url_for('view_log', repo=repo, branchname=branch) }}"
+      (<a href="{{ url_for('view_log',
+                   username=username, repo=repo, branchname=branch) }}"
         >logs</a>)
     </li>
     {% endfor %}
@@ -33,7 +35,8 @@
     <tr>
         <td>
         {% if page > 1%}
-            <a href="{{ url_for('.%s' % origin, repo=repo) }}?page={{page - 1}}">
+            <a href="{{ url_for('.%s' % origin,
+                        username=username, repo=repo) }}?page={{page - 1}}">
                 &lt; Previous
             </a>
         {% else %}
@@ -43,7 +46,8 @@
         <td>{{ page }} / {{ total_page }}</td>
         <td>
             {% if page < total_page %}
-            <a href="{{ url_for('.%s' % origin, repo=repo) }}?page={{page + 1}}">
+            <a href="{{ url_for('.%s' % origin,
+                        username=username, repo=repo) }}?page={{page + 1}}">
                 Next &gt;
             </a>
             {% else %}
@@ -63,7 +67,8 @@
   <ul>
     {% for commit in last_commits %}
     <li>
-      <a href="{{ url_for('view_commit', repo=repo, commitid=commit.hex) }}">
+      <a href="{{ url_for('view_commit',
+                  username=username, repo=repo, commitid=commit.hex) }}">
         {{ commit.hex[:6] }}
       </a>
       {{ commit.message.split('\n')[0] }}
@@ -81,8 +86,8 @@
         {% if entry.filemode == 16384 %}
         [ ]
         {% endif %}
-        <a href="{{ url_for('view_file',
-                  repo=repo, identifier=branchname, filename=entry.name) }}">
+        <a href="{{ url_for('view_file', username=username,
+                    repo=repo, identifier=branchname, filename=entry.name) }}">
           {{ entry.name }}
         </a>
         {{ entry.hex }}
diff --git a/progit/templates/user_info.html b/progit/templates/user_info.html
index 5c3d267..7fe34a9 100644
--- a/progit/templates/user_info.html
+++ b/progit/templates/user_info.html
@@ -38,7 +38,7 @@
   <ul>
     {% for repo in repos %}
     <li>
-      <a href="{{ url_for('view_repo', user=username, repo=repo)}}">
+      <a href="{{ url_for('view_repo', username=username, repo=repo)}}">
         {{ repo.split('.git')[0] }}
       </a>
       <span class="commit_date">