diff --git a/pype/plugins/global/publish/collect_current_pype_user.py b/pype/plugins/global/publish/collect_current_pype_user.py
index 359e6b852c..a8947dd8fb 100644
--- a/pype/plugins/global/publish/collect_current_pype_user.py
+++ b/pype/plugins/global/publish/collect_current_pype_user.py
@@ -13,7 +13,7 @@ class CollectCurrentUserPype(pyblish.api.ContextPlugin):
     def process(self, context):
         user = os.getenv("PYPE_USERNAME", "").strip()
         if not user:
-            return
+            user = context.data.get("user", getpass.getuser())
 
         context.data["user"] = user
-        self.log.debug("Pype user is \"{}\"".format(user))
+        self.log.debug("Colected user \"{}\"".format(user))
diff --git a/pype/plugins/global/publish/submit_publish_job.py b/pype/plugins/global/publish/submit_publish_job.py
index 99f0ae7cb6..d26ec2bf14 100644
--- a/pype/plugins/global/publish/submit_publish_job.py
+++ b/pype/plugins/global/publish/submit_publish_job.py
@@ -174,7 +174,8 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
         "FTRACK_SERVER",
         "PYPE_METADATA_FILE",
         "AVALON_PROJECT",
-        "PYPE_LOG_NO_COLORS"
+        "PYPE_LOG_NO_COLORS",
+        "PYPE_USERNAME"
     ]
 
     # custom deadline atributes
@@ -297,6 +298,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
         environment["PYPE_METADATA_FILE"] = roothless_metadata_path
         environment["AVALON_PROJECT"] = io.Session["AVALON_PROJECT"]
         environment["PYPE_LOG_NO_COLORS"] = "1"
+        environment["PYPE_USERNAME"] = instance.context.data["user"]
         try:
             environment["PYPE_PYTHON_EXE"] = os.environ["PYPE_PYTHON_EXE"]
         except KeyError:
diff --git a/pype/plugins/maya/publish/submit_maya_deadline.py b/pype/plugins/maya/publish/submit_maya_deadline.py
index 7509b5875a..0ae19cbb81 100644
--- a/pype/plugins/maya/publish/submit_maya_deadline.py
+++ b/pype/plugins/maya/publish/submit_maya_deadline.py
@@ -348,7 +348,7 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
         comment = context.data.get("comment", "")
         dirname = os.path.join(workspace, "renders")
         renderlayer = instance.data['setMembers']       # rs_beauty
-        deadline_user = context.data.get("deadlineUser", getpass.getuser())
+        deadline_user = context.data.get("user", getpass.getuser())
         jobname = "%s - %s" % (filename, instance.name)
 
         # Get the variables depending on the renderer
@@ -418,7 +418,7 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
         # Adding file dependencies.
         dependencies = instance.context.data["fileDependencies"]
         dependencies.append(filepath)
-        if self.assembly_files:
+        if self.asset_dependencies:
             for dependency in dependencies:
                 key = "AssetDependency" + str(dependencies.index(dependency))
                 payload_skeleton["JobInfo"][key] = dependency