diff --git a/FRBDK/BuildServerUploader/BuildServerUploaderConsole/Processes/UploadFilesToFrbServer.cs b/FRBDK/BuildServerUploader/BuildServerUploaderConsole/Processes/UploadFilesToFrbServer.cs
index 87fa4036e..09bda54f6 100644
--- a/FRBDK/BuildServerUploader/BuildServerUploaderConsole/Processes/UploadFilesToFrbServer.cs
+++ b/FRBDK/BuildServerUploader/BuildServerUploaderConsole/Processes/UploadFilesToFrbServer.cs
@@ -14,7 +14,7 @@ namespace BuildServerUploaderConsole.Processes
     public enum UploadType
     {
         Entire,
-        TemplatesOnly
+        EngineAndTemplatesOnly
     }
 
     #endregion
@@ -129,8 +129,8 @@ public override void ExecuteStep()
             {
                 UploadGumFiles();
                 UploadFrbdkFiles();
-                UploadEngineFiles();
             }
+            UploadEngineFiles();
             UploadTemplateFiles(_ftpFolder, Results);
         }
 
diff --git a/FRBDK/BuildServerUploader/BuildServerUploaderConsole/Program.cs b/FRBDK/BuildServerUploader/BuildServerUploaderConsole/Program.cs
index bda51457c..da62506b7 100644
--- a/FRBDK/BuildServerUploader/BuildServerUploaderConsole/Program.cs
+++ b/FRBDK/BuildServerUploader/BuildServerUploaderConsole/Program.cs
@@ -80,15 +80,12 @@ private static void CreateZipAndUploadTemplates(string[] args)
         {
             ProcessSteps.Add(new ZipTemplates(Results));
 
-            string username = null;
-            string password = null;
-
             if(args.Length < 3)
             {
                 throw new Exception("Expected 3 arguments: {operation} {username} {password}, but only got " + args.Length + "arguments");
             }
 
-            ProcessSteps.Add(new UploadFilesToFrbServer(Results, UploadType.TemplatesOnly, args[1], args[2]));
+            ProcessSteps.Add(new UploadFilesToFrbServer(Results, UploadType.EngineAndTemplatesOnly, args[1], args[2]));
 
 
         }