diff --git a/app/Http/Controllers/Dashboard/IncidentController.php b/app/Http/Controllers/Dashboard/IncidentController.php
index 7b1cdf20..6abe218a 100644
--- a/app/Http/Controllers/Dashboard/IncidentController.php
+++ b/app/Http/Controllers/Dashboard/IncidentController.php
@@ -180,7 +180,10 @@ class IncidentController extends Controller
     public function createIncidentTemplateAction()
     {
         try {
-            IncidentTemplate::create(Binput::get('template'));
+            IncidentTemplate::create([
+                'name'     => Binput::get('name'),
+                'template' => Binput::get('template', null, false, false)
+            ]);
         } catch (ValidationException $e) {
             return cachet_redirect('dashboard.templates.create')
                 ->withInput(Binput::all())
diff --git a/app/Models/IncidentTemplate.php b/app/Models/IncidentTemplate.php
index b5ded450..d692f47b 100644
--- a/app/Models/IncidentTemplate.php
+++ b/app/Models/IncidentTemplate.php
@@ -44,7 +44,6 @@ class IncidentTemplate extends Model
      */
     public $rules = [
         'name'     => 'required|string',
-        'slug'     => 'required|string',
         'template' => 'required|string',
     ];
 
diff --git a/resources/views/dashboard/templates/add.blade.php b/resources/views/dashboard/templates/add.blade.php
index a2033405..dc7318ee 100644
--- a/resources/views/dashboard/templates/add.blade.php
+++ b/resources/views/dashboard/templates/add.blade.php
@@ -38,11 +38,11 @@
                 <fieldset>
                     <div class="form-group">
                         <label for="template-name">{{ trans('forms.incidents.templates.name') }}</label>
-                        <input type="text" class="form-control" name="template[name]" id="template-name" required placeholder="{{ trans('forms.incidents.templates.name') }}">
+                        <input type="text" class="form-control" name="name" id="template-name" required placeholder="{{ trans('forms.incidents.templates.name') }}" value="{{ Binput::old('name') }}">
                     </div>
                     <div class="form-group">
                         <label>{{ trans('forms.incidents.templates.template') }}</label>
-                        <textarea name="template[template]" id="cm-editor" class="form-control" rows="8" placeholder="{{ trans('forms.incidents.templates.template') }}"></textarea>
+                        <textarea name="template" id="cm-editor" class="form-control" rows="8" placeholder="{{ trans('forms.incidents.templates.template') }}">{{ Binput::old('template') }}</textarea>
                         <span class="help-block">{!! trans('forms.incidents.templates.twig') !!}</span>
                     </div>
                 </fieldset>