diff --git a/progit/fork.py b/progit/fork.py
index 890365b..e2e9f88 100644
--- a/progit/fork.py
+++ b/progit/fork.py
@@ -228,7 +228,7 @@ def fork_project(repo, username=None):
         message = progit.lib.fork_project(
             session=SESSION,
             repo=repo,
-            repofolder=APP.config['GIT_FOLDER'],
+            gitfolder=APP.config['GIT_FOLDER'],
             forkfolder=APP.config['FORK_FOLDER'],
             docfolder=APP.config['DOCS_FOLDER'],
             user=flask.g.fas_user.username)
diff --git a/progit/lib.py b/progit/lib.py
index a8a5d9f..1ba45b7 100644
--- a/progit/lib.py
+++ b/progit/lib.py
@@ -159,8 +159,8 @@ def edit_issue(session, issue, title=None, content=None, status=None):
 
 def fork_project(session, user, repo, gitfolder, forkfolder, docfolder):
     ''' Fork a given project into the user's forks. '''
-    reponame = os.path.join(repo_folder, repo.path)
-    forkreponame = os.path.join(fork_folder, user, repo.path)
+    reponame = os.path.join(gitfolder, repo.path)
+    forkreponame = os.path.join(forkfolder, repo.path)
 
     if os.path.exists(forkreponame):
         raise progit.exceptions.RepoExistsException(