diff --git a/smash/web/templates/subjects/edit.html b/smash/web/templates/subjects/edit.html
index 6b74afe21d9be5cc7e1269ced44a9b272754b3cd..124a4d539a080cf7f95e06660da5c89299d438a8 100644
--- a/smash/web/templates/subjects/edit.html
+++ b/smash/web/templates/subjects/edit.html
@@ -26,7 +26,7 @@
 <div class="box box-info">
 	<div class="box-header with-border">
 		<a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default" onclick="history.back()">Go back (without changes)</a>
-    <a href="{% url 'web.views.subject_visit_details' id %}" type = "button" class="btn btn-block btn-default">Subject's visits</a>
+    <a href="{% url 'web.views.subject_visit_details' subject.id %}" type = "button" class="btn btn-block btn-default">Subject's visits</a>
 	</div>
 
 	{% comment %} <div class="box-header with-border">
@@ -57,8 +57,20 @@
 			{% endfor %}
 
         <div class="col-md-6">
-          <a href="{% url 'web.views.subject_mark' id 'rejected' %}" class="btn btn-warning btn-block">Mark as rejected</a>
-          <a href="{% url 'web.views.subject_mark' id 'dead' %}" class="btn btn-danger btn-block">Mark as dead</a><br />
+          {% if not subject.resigned %}
+            <a href="{% url 'web.views.subject_mark' subject.id 'rejected' %}" class="btn btn-warning btn-block">Mark as rejected</a>
+          {% else %}
+            <label for="{# TODO #}" class="col-sm-4 control-label">REJECTED</label>
+					  <div class="col-sm-8">{{subject.resigned}}</div>
+          {% endif %}
+        </div>
+        <div class="col-md-6">
+          {% if not subject.dead %}
+            <a href="{% url 'web.views.subject_mark' subject.id 'dead' %}" class="btn btn-danger btn-block">Mark as dead</a><br />
+          {% else %}
+            <label for="{# TODO #}" class="col-sm-4 control-label">DEAD</label>
+            <div class="col-sm-8">{{subject.dead}}</div>
+          {% endif %}
         </div>
       </div>
 
diff --git a/smash/web/views.py b/smash/web/views.py
index 0af808bf51cc9a2fe328c558c5f29bfe407e56fb..de0d873010fa865745968791f0a08321fb16afba 100644
--- a/smash/web/views.py
+++ b/smash/web/views.py
@@ -328,7 +328,10 @@ def subject_edit(request, id):
 			return redirect(subjects)
 	else:
 		form = SubjectEditForm(instance=the_subject)
-	return wrap_response(request, 'subjects/edit.html', {'form': form, 'id':id})
+	return wrap_response(request, 'subjects/edit.html', {
+		'form': form,
+		'subject': the_subject
+		})
 
 
 def subject_delete(request, id):