diff --git a/api/http/handler/customtemplates/customtemplate_create.go b/api/http/handler/customtemplates/customtemplate_create.go
index af1a81e48..9940ba584 100644
--- a/api/http/handler/customtemplates/customtemplate_create.go
+++ b/api/http/handler/customtemplates/customtemplate_create.go
@@ -251,7 +251,7 @@ func (payload *customTemplateFromFileUploadPayload) Validate(r *http.Request) er
 	}
 	payload.Type = templateType
 
-	composeFileContent, _, err := request.RetrieveMultiPartFormFile(r, "file")
+	composeFileContent, _, err := request.RetrieveMultiPartFormFile(r, "File")
 	if err != nil {
 		return errors.New("Invalid Compose file. Ensure that the Compose file is uploaded correctly")
 	}
diff --git a/app/portainer/services/api/customTemplate.js b/app/portainer/services/api/customTemplate.js
index 61791edc8..12d7d4688 100644
--- a/app/portainer/services/api/customTemplate.js
+++ b/app/portainer/services/api/customTemplate.js
@@ -41,7 +41,8 @@ function CustomTemplateServiceFactory(CustomTemplates, FileUploadService) {
 
   service.createCustomTemplateFromFileUpload = async function createCustomTemplateFromFileUpload(payload) {
     try {
-      return await FileUploadService.createCustomTemplate(payload);
+      const { data } = await FileUploadService.createCustomTemplate(payload);
+      return data;
     } catch (err) {
       throw { msg: 'Unable to create the customTemplate', err };
     }
diff --git a/app/portainer/views/custom-templates/create-custom-template-view/createCustomTemplateViewController.js b/app/portainer/views/custom-templates/create-custom-template-view/createCustomTemplateViewController.js
index 494f90e5c..0ee26e050 100644
--- a/app/portainer/views/custom-templates/create-custom-template-view/createCustomTemplateViewController.js
+++ b/app/portainer/views/custom-templates/create-custom-template-view/createCustomTemplateViewController.js
@@ -65,12 +65,12 @@ class CreateCustomTemplateViewController {
 
     this.state.actionInProgress = true;
     try {
-      const { ResourceControl } = await this.createCustomTemplateByMethod(method);
+      const customTemplate = await this.createCustomTemplateByMethod(method);
 
       const accessControlData = this.formValues.AccessControlData;
       const userDetails = this.Authentication.getUserDetails();
       const userId = userDetails.ID;
-      await this.ResourceControlService.applyResourceControl(userId, accessControlData, ResourceControl);
+      await this.ResourceControlService.applyResourceControl(userId, accessControlData, customTemplate.ResourceControl);
 
       this.Notifications.success('Custom template successfully created');
       this.$state.go('docker.templates.custom');