diff --git a/app/components/createService/createServiceController.js b/app/components/createService/createServiceController.js
index ca5b9f7dd..9a29f315d 100644
--- a/app/components/createService/createServiceController.js
+++ b/app/components/createService/createServiceController.js
@@ -222,7 +222,9 @@ function ($q, $scope, $state, Service, ServiceHelper, SecretHelper, SecretServic
       var secrets = [];
       angular.forEach(input.Secrets, function(secret) {
         if (secret.model) {
-          secrets.push(SecretHelper.secretConfig(secret.model));
+          var s = SecretHelper.secretConfig(secret.model);
+          s.File.Name = s.SecretName;
+          secrets.push(s);
         }
       });
       config.TaskTemplate.ContainerSpec.Secrets = secrets;
diff --git a/app/helpers/secretHelper.js b/app/helpers/secretHelper.js
index ff84aaef5..9c0f3d65b 100644
--- a/app/helpers/secretHelper.js
+++ b/app/helpers/secretHelper.js
@@ -21,7 +21,7 @@ angular.module('portainer.helpers')
           SecretID: secret.Id,
           SecretName: secret.Name,
           File: {
-            Name: secret.Name,
+            Name: secret.FileName,
             UID: '0',
             GID: '0',
             Mode: 444