diff --git a/progit/fork.py b/progit/fork.py
index c63572c..0e15e03 100644
--- a/progit/fork.py
+++ b/progit/fork.py
@@ -26,10 +26,11 @@ from progit import APP, SESSION, LOG
 
 ### Application
 @APP.route('/fork/<repo>')
-def fork_project(repo):
+@APP.route('/fork/<username>/<repo>')
+def fork_project(repo, username=None):
     """ Fork the project specified into the user's namespace
     """
-    repo = progit.lib.get_project(SESSION, repo)
+    repo = progit.lib.get_project(SESSION, repo, user=username)
 
     if repo is None:
         flask.abort(404)
diff --git a/progit/templates/repo_master.html b/progit/templates/repo_master.html
index 8ced7ac..7aacfc6 100644
--- a/progit/templates/repo_master.html
+++ b/progit/templates/repo_master.html
@@ -61,7 +61,13 @@
     </ul>
     <ul class="right">
       <li {% if select == '' %}class="selected" {% endif %}>
-        <a href="{{ url_for('fork_project', repo=repo.name) }}">Fork</a>
+          {% if '/fork/' in request.url %}
+          <a href="{{ url_for(
+            'fork_project', repo=repo.name, username=username) }}">
+        {% else %}
+          <a href="{{ url_for('fork_project', repo=repo.name) }}">
+        {% endif %}
+        Fork</a>
       </li>
       {% if g.fas_user and g.fas_user.username == repo.user %}
       <li {% if select == '' %}class="selected" {% endif %}>