diff --git a/resources/views/dashboard/incidents/add.blade.php b/resources/views/dashboard/incidents/add.blade.php
index 00f4ef45..a06ded8a 100644
--- a/resources/views/dashboard/incidents/add.blade.php
+++ b/resources/views/dashboard/incidents/add.blade.php
@@ -104,14 +104,14 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label>{{ trans('forms.incidents.incident_time') }}</label>
+                            <label>{{ trans('forms.incidents.incident_time') }}</label> <small class="text-muted">{{ trans('forms.optional') }}</small>
                             <input type="text" name="created_at" class="form-control" rel="datepicker-any">
-                            <span class="help-block">{{ trans('forms.optional') }}</span>
                         </div>
-                        <div class="form-group">
-                            <label>{{ trans('forms.incidents.notify_subscribers') }}</label>
-                            <input type="checkbox" name="notify" value="1" checked="{{ Input::old('incident.message', 'checked') }}">
-                            <span class="help-block">{{ trans('forms.optional') }}</span>
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" name="notify" value="1" checked="{{ Input::old('incident.message', 'checked') }}">
+                                {{ trans('forms.incidents.notify_subscribers') }}
+                            </label>
                         </div>
                     </fieldset>
 
diff --git a/resources/views/dashboard/incidents/edit.blade.php b/resources/views/dashboard/incidents/edit.blade.php
index ae458f46..d76236ad 100644
--- a/resources/views/dashboard/incidents/edit.blade.php
+++ b/resources/views/dashboard/incidents/edit.blade.php
@@ -77,9 +77,8 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label>{{ trans('forms.incidents.incident_time') }}</label>
+                            <label>{{ trans('forms.incidents.incident_time') }}</label> <small class="text-muted">{{ trans('forms.optional') }}</small>
                             <input type="text" name="created_at" class="form-control" rel="datepicker-any" value="{{ $incident->created_at_datetimepicker }}">
-                            <span class="help-block">{{ trans('forms.optional') }}</span>
                         </div>
                     </fieldset>