diff --git a/ui/app/scripts/controllers/case/CaseCreationCtrl.js b/ui/app/scripts/controllers/case/CaseCreationCtrl.js
index 3c5763e7bd..c3691013ba 100644
--- a/ui/app/scripts/controllers/case/CaseCreationCtrl.js
+++ b/ui/app/scripts/controllers/case/CaseCreationCtrl.js
@@ -1,10 +1,10 @@
 /**
  * Controller for new case modal page
  */
-(function() {
+(function () {
     'use strict';
     angular.module('theHiveControllers').controller('CaseCreationCtrl',
-        function($rootScope, $scope, $state, $modalInstance, CaseSrv, AlertSrv, MetricsCacheSrv, template) {
+        function ($rootScope, $scope, $state, $modalInstance, CaseSrv, AlertSrv, MetricsCacheSrv, template) {
 
             $rootScope.title = 'New case';
             $scope.activeTlp = 'active';
@@ -20,7 +20,7 @@
 
             if ($scope.fromTemplate === true) {
 
-                MetricsCacheSrv.all().then(function(list) {
+                MetricsCacheSrv.all().then(function (list) {
                     // Set basic info from template
                     $scope.newCase = {
                         status: 'Open',
@@ -33,7 +33,7 @@
                     // Set metrics from template
                     $scope.metricsCache = list;
                     var metrics = {};
-                    _.each(template.metricNames, function(m) {
+                    _.each(template.metricNames, function (m) {
                         metrics[m] = null;
                     });
                     $scope.newCase.metrics = metrics;
@@ -42,7 +42,7 @@
                     $scope.tags = template.tags;
 
                     // Set tasks from template
-                    $scope.tasks = _.map(template.tasks, function(t) {
+                    $scope.tasks = _.map(template.tasks, function (t) {
                         return t.title;
                     });
                 });
@@ -54,17 +54,17 @@
                 };
             }
 
-            $scope.updateTlp = function(tlp) {
+            $scope.updateTlp = function (tlp) {
                 $scope.newCase.tlp = tlp;
             };
 
-            $scope.createNewCase = function(isValid) {
+            $scope.createNewCase = function (isValid) {
                 if (!isValid) {
                     return;
                 }
 
                 $scope.newCase.tags = [];
-                angular.forEach($scope.tags, function(tag) {
+                angular.forEach($scope.tags, function (tag) {
                     $scope.newCase.tags.push(tag.text);
                 });
                 $scope.newCase.tags = $.unique($scope.newCase.tags.sort());
@@ -72,29 +72,40 @@
                 // Append title prefix
                 if ($scope.fromTemplate) {
                     $scope.newCase.title = $scope.template.titlePrefix + ' ' + $scope.temp.titleSuffix;
+                    
+                    $scope.newCase.tasks = _.map($scope.template.tasks, function (task) {
+                        return {
+                            title: task.title,
+                            description: task.description,
+                            flag: false,
+                            status: 'Waiting'
+                        };
+                    });
+
+                } else {
+                    $scope.newCase.tasks = _.map($scope.tasks, function (task) {
+                        return {
+                            title: task,
+                            flag: false,
+                            status: 'Waiting'
+                        };
+                    });
                 }
 
-                $scope.newCase.tasks = _.map($scope.tasks, function(task) {
-                    return {
-                        title: task,
-                        flag: false,
-                        status: 'Waiting'
-                    };
-                });
 
                 $scope.pendingAsync = true;
-                CaseSrv.save({}, $scope.newCase, function(data) {
+                CaseSrv.save({}, $scope.newCase, function (data) {
                     $state.go('app.case.details', {
                         caseId: data.id
                     });
                     $modalInstance.close();
-                }, function(response) {
+                }, function (response) {
                     $scope.pendingAsync = false;
                     AlertSrv.error('CaseCreationCtrl', response.data, response.status);
                 });
             };
 
-            $scope.addTask = function(task) {
+            $scope.addTask = function (task) {
                 if ($scope.tasks.indexOf(task) === -1) {
                     $scope.tasks.push(task);
                 }
@@ -102,11 +113,11 @@
                 angular.element('.task-input').focus();
             };
 
-            $scope.removeTask = function(task) {
+            $scope.removeTask = function (task) {
                 $scope.tasks = _.without($scope.tasks, task);
             };
 
-            $scope.cancel = function() {
+            $scope.cancel = function () {
                 $modalInstance.dismiss();
             };
         }