diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py
index 92b438d..8f4d0d9 100644
--- a/pagure/lib/__init__.py
+++ b/pagure/lib/__init__.py
@@ -1781,7 +1781,7 @@ def fork_project(session, user, repo, gitfolder,
 
     return tasks.fork.delay(repo.name,
                             repo.namespace,
-                            repo.user if repo.is_fork else None,
+                            repo.user.username if repo.is_fork else None,
                             user,
                             editbranch,
                             editfile).id
diff --git a/pagure/lib/git.py b/pagure/lib/git.py
index 98b91b5..18d28eb 100644
--- a/pagure/lib/git.py
+++ b/pagure/lib/git.py
@@ -217,11 +217,10 @@ def update_git(obj, repo, repofolder):
     else:
         raise NotImplementedError('Unknown object type %s' % obj.isa)
 
-    if repo.is_fork:
-        user = repo.user
-
     return pagure.lib.tasks.update_git.delay(
-        repo.name, repo.namespace, user, ticketuid, requestuid)
+        repo.name, repo.namespace,
+        repo.user.username if repo.is_fork else None,
+        ticketuid, requestuid)
 
 
 def _update_git(obj, repo, repofolder):
@@ -323,7 +322,7 @@ def clean_git(obj, repo, repofolder):
         user = repo.user
 
     return pagure.lib.tasks.clean_git.delay(
-        repo.name, repo.namespace, user, ticketuid)
+        repo.name, repo.namespace, user.username, ticketuid)
 
 
 def _clean_git(obj, repo, repofolder):