diff --git a/gistsSource.py b/gistsSource.py
index a1a753c..57e9a61 100644
--- a/gistsSource.py
+++ b/gistsSource.py
@@ -26,7 +26,7 @@ def gistsSource():
         repo_owner = repo.owner.login
 
         if gitea_uid == 'failed':
-            gitea_uid = giteaCreateOrg(repo.owner.login)
+            gitea_uid = giteaCreateUserOrOrg(repo.owner.login,repo.owner.type)
 
         if gitea_uid == 'failed':
             gitea_uid = default_gist_user
diff --git a/gistsStared.py b/gistsStared.py
index b3a0744..6e8e7f7 100644
--- a/gistsStared.py
+++ b/gistsStared.py
@@ -26,7 +26,7 @@ def gistsStared():
         repo_owner = repo.owner.login
 
         if gitea_uid == 'failed':
-            gitea_uid = giteaCreateOrg(repo.owner.login)
+            gitea_uid = giteaCreateUserOrOrg(repo.owner.login,repo.owner.type)
 
         if gitea_uid == 'failed':
             gitea_uid = default_gist_user
@@ -58,6 +58,7 @@ def gistsStared():
                 topics.append('public-gist')
                 topics.append('public-{0}-gist'.format(repo_owner))
             giteaSetRepoTopics(repo_owner,m["repo_name"],topics)
+            giteaSetRepoStar(repo_owner,m["repo_name"])
 
         if status == 'failed':
             print(repo)
diff --git a/helper.py b/helper.py
index 6089c7d..0f7526b 100644
--- a/helper.py
+++ b/helper.py
@@ -42,6 +42,7 @@ def giteaSetRepoTopics(owner,repo_name,topics):
         print('     ---> Success : Repository Topics Set')
     else:
         print('     ---> Error : Unable To SetRepository Topics')
+        print(r.text,json.dumps(m))
 
 def giteaSetRepoStar(owner,repo_name,topics):
     r = session.put(giteaHost("user/starred/{0}/{1}/".format(owner,repo_name)))
diff --git a/repositoryForked.py b/repositoryForked.py
index 47382a2..dc10970 100644
--- a/repositoryForked.py
+++ b/repositoryForked.py
@@ -22,7 +22,7 @@ def repositoryForked():
             gitea_uid = giteaGetUser(gitea_dest_user)
 
             if gitea_uid == 'failed':
-                gitea_uid = giteaCreateOrg(gitea_dest_user)
+                gitea_uid = giteaCreateUserOrOrg(gitea_dest_user,repo.owner.type)
 
             repo_name = "{0}".format(real_repo)
 
@@ -35,11 +35,13 @@ def repositoryForked():
                 "uid"               : gitea_uid,
             }
 
-        status = giteaCreateRepo(m,repo.private)
-        if status != 'failed':
-            topics = repo.get_topics()
-            giteaSetRepoTopics(repo_owner,repo_name,topics)
-        else:
-            print(repo)
+            status = giteaCreateRepo(m,repo.private)
+            if status != 'failed':
+                topics = repo.get_topics()
+                topics.append('forked-repo')
+                topics.append('forked-{0}-repo'.format(repo_owner))
+                giteaSetRepoTopics(repo_owner,repo_name,topics)
+            else:
+                print(repo)
 
-        print(" ")
\ No newline at end of file
+            print(" ")
\ No newline at end of file
diff --git a/repositorySource.py b/repositorySource.py
index 7b8718d..69d3530 100644
--- a/repositorySource.py
+++ b/repositorySource.py
@@ -22,7 +22,7 @@ def repositorySource():
             gitea_uid = giteaGetUser(gitea_dest_user)
 
             if gitea_uid == 'failed':
-                gitea_uid = giteaCreateOrg(gitea_dest_user)
+                gitea_uid = giteaCreateUserOrOrg(gitea_dest_user,repo.owner.type)
 
             repo_name = "{0}".format(real_repo)
 
diff --git a/repositoryStared.py b/repositoryStared.py
index 484d9b0..a6a41c4 100644
--- a/repositoryStared.py
+++ b/repositoryStared.py
@@ -40,7 +40,7 @@ def repositoryStared():
             topics.append('starred-repo')
             topics.append('starred-{0}-repo'.format(repo_owner))
             giteaSetRepoTopics(repo_owner,repo_name,topics)
-            giteaSetRepoStar(repo_owner,repo_name,topics)
+            giteaSetRepoStar(repo_owner,repo_name)
         else:
             print(repo)