diff --git a/ietf/idrfc/views_ballot.py b/ietf/idrfc/views_ballot.py
index 48b852c30..1dbd30d40 100644
--- a/ietf/idrfc/views_ballot.py
+++ b/ietf/idrfc/views_ballot.py
@@ -21,6 +21,8 @@ from ietf.ipr.models import IprDetail
 from ietf.idrfc.mails import *
 from ietf.idrfc.utils import *
 from ietf.idrfc.lastcall import request_last_call
+from ietf.idrfc.idrfc_wrapper import BallotWrapper
+
 
 BALLOT_CHOICES = (("yes", "Yes"),
                   ("noobj", "No Objection"),
@@ -186,6 +188,7 @@ def edit_position(request, name):
                                    comment=comment,
                                    ad=ad,
                                    return_to_url=return_to_url,
+                                   ballot=BallotWrapper(doc.idinternal)
                                    ),
                               context_instance=RequestContext(request))
 
diff --git a/ietf/templates/idrfc/edit_position.html b/ietf/templates/idrfc/edit_position.html
index 1a4107f00..6a40df76b 100644
--- a/ietf/templates/idrfc/edit_position.html
+++ b/ietf/templates/idrfc/edit_position.html
@@ -32,8 +32,18 @@ form.position-form .comment-text {
 <h1>Change position for {{ ad }} on {{ doc }}</h1>
 
 <form class="position-form" action="" method="POST">
+
+<div>
   <div class="position">{{ form.position }}</div>
 
+    {% if ballot.was_deferred %}
+      <div style="margin-top:8px; margin-bottom:8px;"><span id="doc_undefer_ballot_button" class="yui-button yui-link-button"><span class="first-child"><a href="{% url doc_undefer_ballot name=doc %}">Undefer ballot</a></span></span></div>
+      <div style="margin-top:8px; margin-bottom:8px;">Ballot deferred by {{ ballot.deferred_by }} on {{ ballot.deferred_date }}.</div>
+    {% else %}
+      <div style="margin-top:8px; margin-bottom:8px;"><span id="doc_defer_ballot_button" class="yui-button yui-link-button"><span class="first-child"><a href="{% url doc_defer_ballot name=doc %}">Defer ballot</a></span></span></div>
+    {% endif %}
+</div>
+
   <div style="clear:left"></div>
   
   <div class="discuss-widgets">