diff --git a/app/Http/Controllers/Dashboard/IncidentController.php b/app/Http/Controllers/Dashboard/IncidentController.php
index 8cd43ce0..376f8a35 100644
--- a/app/Http/Controllers/Dashboard/IncidentController.php
+++ b/app/Http/Controllers/Dashboard/IncidentController.php
@@ -315,7 +315,7 @@ class IncidentController extends Controller
                 $this->auth->user()
             ));
         } catch (ValidationException $e) {
-            return cachet_redirect('dashboard.incidents.update', ['id' => $incident->id])
+            return cachet_redirect('dashboard.incidents.updates', ['id' => $incident->id])
                 ->withInput(Binput::all())
                 ->withTitle(sprintf('%s %s', trans('dashboard.notifications.whoops'), trans('dashboard.incidents.templates.edit.failure')))
                 ->withErrors($e->getMessageBag());
diff --git a/resources/views/dashboard/incidents/update.blade.php b/resources/views/dashboard/incidents/update.blade.php
index 9da06e01..5fb9dc6a 100644
--- a/resources/views/dashboard/incidents/update.blade.php
+++ b/resources/views/dashboard/incidents/update.blade.php
@@ -21,22 +21,22 @@
                     <div class="form-group">
                         <label for="incident-name">{{ trans('forms.incidents.status') }}</label><br>
                         <label class="radio-inline">
-                            <input type="radio" name="status" value="1" required>
+                            <input type="radio" name="status" value="1" required {{ (int) Binput::old('status') === 1 ? 'checked' : null }}>
                             <i class="icon ion-flag"></i>
                             {{ trans('cachet.incidents.status')[1] }}
                         </label>
                         <label class="radio-inline">
-                            <input type="radio" name="status" value="2" required>
+                            <input type="radio" name="status" value="2" required {{ (int) Binput::old('status') === 2 ? 'checked' : null }}>
                             <i class="icon ion-alert-circled"></i>
                             {{ trans('cachet.incidents.status')[2] }}
                         </label>
                         <label class="radio-inline">
-                            <input type="radio" name="status" value="3" required>
+                            <input type="radio" name="status" value="3" required {{ (int) Binput::old('status') === 3 ? 'checked' : null }}>
                             <i class="icon ion-eye"></i>
                             {{ trans('cachet.incidents.status')[3] }}
                         </label>
                         <label class="radio-inline">
-                            <input type="radio" name="status" value="4" required>
+                            <input type="radio" name="status" value="4" required {{ (int) Binput::old('status') === 4 ? 'checked' : null }}>
                             <i class="icon ion-checkmark"></i>
                             {{ trans('cachet.incidents.status')[4] }}
                         </label>
@@ -44,7 +44,7 @@
                     <div class="form-group">
                         <label>{{ trans('forms.incidents.message') }}</label>
                         <div class="markdown-control">
-                            <textarea name="message" class="form-control autosize" rows="5" required></textarea>
+                            <textarea name="message" class="form-control autosize" rows="5" required>{{ Binput::old('message') }}</textarea>
                         </div>
                     </div>
                 </fieldset>