diff --git a/app/views/dashboard/component-add.blade.php b/app/views/dashboard/component-add.blade.php
index 985f4179..bbc94ba1 100644
--- a/app/views/dashboard/component-add.blade.php
+++ b/app/views/dashboard/component-add.blade.php
@@ -20,9 +20,17 @@
 		<form name='CreateComponentForm' class='form-vertical' role='form' action='/dashboard/components/add' method='POST'>
 			<fieldset>
 				<div class='form-group'>
-					<label for='incident-name'>Component Name</label>
+					<label for='incident-name'>Name</label>
 					<input type='text' class='form-control' name='component[name]' id='component-name' required />
 				</div>
+				<div class='form-group'>
+					<label for='component-status'>Status</label>
+					<select name='component[status]' class='form-control'>
+						@foreach(Lang::get('cachet.component.status') as $statusID => $status)
+						<option value='{{ $statusID }}'>{{ $status }}</option>
+						@endforeach
+					</select>
+				</div>
 				<div class='form-group'>
 					<label>Description</label>
 					<textarea name='component[description]' class='form-control' rows='5'></textarea>
diff --git a/app/views/dashboard/component-edit.blade.php b/app/views/dashboard/component-edit.blade.php
index 40dd345a..18ddaec4 100644
--- a/app/views/dashboard/component-edit.blade.php
+++ b/app/views/dashboard/component-edit.blade.php
@@ -20,9 +20,17 @@
 		<form name='EditComponentForm' class='form-vertical' role='form' action='/dashboard/components/{{ $component->id }}/edit' method='POST'>
 			<fieldset>
 				<div class='form-group'>
-					<label for='incident-name'>Component Name</label>
+					<label for='incident-name'>Name</label>
 					<input type='text' class='form-control' name='component[name]' id='component-name' required value='{{ $component->name }}' />
 				</div>
+				<div class='form-group'>
+					<label for='component-status'>Status</label>
+					<select name='component[status]' class='form-control'>
+						@foreach(Lang::get('cachet.component.status') as $statusID => $status)
+						<option value='{{ $statusID }}' {{ $statusID === $component->status ? "selected" : "" }}>{{ $status }}</option>
+						@endforeach
+					</select>
+				</div>
 				<div class='form-group'>
 					<label>Description</label>
 					<textarea name='component[description]' class='form-control' rows='5'>{{ $component->description }}</textarea>