diff --git a/bin/joj3-forge-convert b/bin/joj3-forge-convert
index 2053e89..fe19bf0 100755
--- a/bin/joj3-forge-convert
+++ b/bin/joj3-forge-convert
@@ -29,13 +29,14 @@ main() {
 
     if ! [ -d "$config_repo_path" ]; then
         git clone "$git_server/$course/$course-config.git" "$config_repo_path"
+        git -C "$config_repo_path" config user.name "$git_user"
+        git -C "$config_repo_path" config user.email "$git_email"
     fi
-    # TODO: move this into if statement
-    git -C "$config_repo_path" config user.name "$git_user"
-    git -C "$config_repo_path" config user.email "$git_email"
 
     if ! [ -d "$grading_repo_path" ]; then
         git clone "$git_server/$course/$course-joj.git" "$grading_repo_path"
+        git -C "$grading_repo_path" config user.name "$git_user"
+        git -C "$grading_repo_path" config user.email "$git_email"
         git -C "$grading_repo_path" switch --orphan grading
         cat >"$grading_repo_path/Readme.md" <<EOF
 # $course JOJ grading
@@ -46,9 +47,6 @@ EOF
         git -C "$grading_repo_path" commit -m"docs: readme"
         git -C "$grading_repo_path" push -u origin grading
     fi
-    # TODO: move this into if statement
-    git -C "$grading_repo_path" config user.name "$git_user"
-    git -C "$grading_repo_path" config user.email "$git_email"
 
     git -C "$config_repo_path" reset --hard
     git -C "$config_repo_path" pull --rebase