diff --git a/app/Http/Controllers/Dashboard/IncidentUpdateController.php b/app/Http/Controllers/Dashboard/IncidentUpdateController.php
index 8c1ce62a..092809e3 100644
--- a/app/Http/Controllers/Dashboard/IncidentUpdateController.php
+++ b/app/Http/Controllers/Dashboard/IncidentUpdateController.php
@@ -16,8 +16,8 @@ use CachetHQ\Cachet\Bus\Commands\IncidentUpdate\CreateIncidentUpdateCommand;
 use CachetHQ\Cachet\Bus\Commands\IncidentUpdate\UpdateIncidentUpdateCommand;
 use CachetHQ\Cachet\Integrations\Contracts\System;
 use CachetHQ\Cachet\Models\Incident;
-use CachetHQ\Cachet\Models\IncidentUpdate;
 use CachetHQ\Cachet\Models\IncidentTemplate;
+use CachetHQ\Cachet\Models\IncidentUpdate;
 use GrahamCampbell\Binput\Facades\Binput;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Routing\Controller;
diff --git a/resources/views/dashboard/incidents/add.blade.php b/resources/views/dashboard/incidents/add.blade.php
index 39531c91..421013bc 100644
--- a/resources/views/dashboard/incidents/add.blade.php
+++ b/resources/views/dashboard/incidents/add.blade.php
@@ -25,7 +25,7 @@
                     <fieldset>
                         @if($incidentTemplates->count() > 0)
                         <div class="form-group">
-                            <label for="incident-template">{{ trans('forms.incidents.templates.template') }}</label>
+                            <label for="template">{{ trans('forms.incidents.templates.template') }}</label>
                             <select class="form-control" name="template" v-model="template">
                                 <option selected></option>
                                 @foreach($incidentTemplates as $tpl)
diff --git a/resources/views/dashboard/incidents/updates/add.blade.php b/resources/views/dashboard/incidents/updates/add.blade.php
index 758654ac..12d99621 100644
--- a/resources/views/dashboard/incidents/updates/add.blade.php
+++ b/resources/views/dashboard/incidents/updates/add.blade.php
@@ -25,7 +25,7 @@
                     <fieldset>
                         @if($incidentTemplates->count() > 0)
                             <div class="form-group">
-                                <label for="incident-template">{{ trans('forms.incidents.templates.template') }}</label>
+                                <label for="template">{{ trans('forms.incidents.templates.template') }}</label>
                                 <select class="form-control" name="template" v-model="template">
                                     <option selected></option>
                                     @foreach($incidentTemplates as $tpl)
@@ -96,7 +96,7 @@
                         </div>
                         @endif
                         <div class="form-group">
-                            <label>{{ trans('forms.incidents.message') }}</label>
+                            <label for="message">{{ trans('forms.incidents.message') }}</label>
                             <div class="markdown-control">
                                 <textarea name="message" class="form-control autosize" rows="5" required>{{ Binput::old('message') }}</textarea>
                             </div>