diff --git a/protocoloadm/views.py b/protocoloadm/views.py
index a2d983b80..1f7f49615 100644
--- a/protocoloadm/views.py
+++ b/protocoloadm/views.py
@@ -195,10 +195,19 @@ class ProtocoloPesquisaView(TemplateView, FormMixin):
 
 
 class AnularProcoloAdmForm(forms.Form):
+
+    from datetime import date
+    YEARS = [(year, year) for year in range(date.today().year, 1960, -1)]
+
     numero_protocolo = forms.CharField(
         label='Número de Protocolo', required=True)
-    ano = forms.CharField(label='Ano', required=True)
-    motivo = forms.CharField(label='Motivo', required=True)
+    ano_protocolo = forms.ChoiceField(required=False,
+                                      label="Year",
+                                      choices=YEARS,
+                                      widget=forms.Select(
+                                        attrs={'class': 'selector'}))
+    justificativa_anulacao = forms.CharField(
+        widget=forms.Textarea, label='Motivo', required=True)
 
 
 def get_client_ip(request):
@@ -217,7 +226,8 @@ class AnularProtocoloAdmView(FormMixin, TemplateView):
         return reverse('anular_protocolo')
 
     def get(self, request, *args, **kwargs):
-        return self.render_to_response({})
+        form = AnularProcoloAdmForm()
+        return self.render_to_response({'form': form})
 
     def post(self, request, *args, **kwargs):
 
@@ -236,8 +246,11 @@ class AnularProtocoloAdmView(FormMixin, TemplateView):
                 protocolo = Protocolo.objects.get(numero=numero, ano=ano)
 
                 if protocolo.anulado:
-                    form._errors = {
-                        'error_message': 'Procolo encontra-se anulado'}
+                    errors = form._errors.setdefault(
+                                        forms.forms.NON_FIELD_ERRORS,
+                                        forms.util.ErrorList())
+                    errors.append("Procolo %s/%s já encontra-se anulado"
+                                  % (numero, ano))
                     return self.form_invalid(form)
 
                 protocolo.anulado = True
@@ -249,7 +262,9 @@ class AnularProtocoloAdmView(FormMixin, TemplateView):
                 return self.form_valid(form)
 
             except ObjectDoesNotExist:
-                form._errors = {'error_message': 'Protocolo não existe'}
+                errors = form._errors.setdefault(
+                    forms.forms.NON_FIELD_ERRORS, forms.util.ErrorList())
+                errors.append("Procolo %s/%s não existe" % (numero, ano))
                 return self.form_invalid(form)
         else:
             return self.form_invalid(form)
diff --git a/templates/protocoloadm/anular_protocoloadm.html b/templates/protocoloadm/anular_protocoloadm.html
index 0ed6f42a0..231e2debc 100644
--- a/templates/protocoloadm/anular_protocoloadm.html
+++ b/templates/protocoloadm/anular_protocoloadm.html
@@ -1,26 +1,11 @@
 {% extends "protocoloadm/protocoloadm_detail.html" %}
 {% load i18n %}
 {% block detail_content %}
-
-{% if form.errors %}
-    {% for field in form %}
-        {% for error in field.errors %}
-            <p> {{ errors }} </p>
-        {% endfor %}
-    {% endfor %}
-{% endif %}
-
+<div>{{ view.message }} </div>
 	<form method="POST">
 		{% csrf_token %}
 		<fieldset>
-			Número / Ano
-			<input type="text" id="numero_protocolo" name="numero_protocolo" /> / 
-
-			<input type="text" id="ano_protocolo" name="ano_protocolo" />
-		</br>
-			Motivo da Anulação
-			<textarea id="justificativa_anulacao" name="justificativa_anulacao">
-			</textarea>
+			{{ form.as_p }}
 		</br>
 			<input type="submit" value="Anular" class="button primary" />
 		</fieldset>