diff --git a/sapl/protocoloadm/views.py b/sapl/protocoloadm/views.py
index 8cee20dca..3e13920d4 100644
--- a/sapl/protocoloadm/views.py
+++ b/sapl/protocoloadm/views.py
@@ -95,9 +95,17 @@ class DocumentoAdministrativoCrud(Crud):
 
     class CreateView(DocumentoAdministrativoMixin, Crud.CreateView):
         form_class = DocumentoAdministrativoForm
+        layout_key = None
 
     class UpdateView(DocumentoAdministrativoMixin, Crud.UpdateView):
         form_class = DocumentoAdministrativoForm
+        layout_key = None
+
+        def get_initial(self):
+            if self.object.protocolo:
+                p = self.object.protocolo
+                return {'ano_protocolo': p.ano,
+                        'numero_protocolo': p.numero}
 
     class DetailView(DocumentoAdministrativoMixin, Crud.DetailView):
         def get_context_data(self, **kwargs):
diff --git a/sapl/templates/protocoloadm/layouts.yaml b/sapl/templates/protocoloadm/layouts.yaml
index 8f5a25129..8b6c935d0 100644
--- a/sapl/templates/protocoloadm/layouts.yaml
+++ b/sapl/templates/protocoloadm/layouts.yaml
@@ -6,8 +6,7 @@ TipoDocumentoAdministrativo:
 DocumentoAdministrativo:
   {% trans 'Indentificação Básica' %}:
   - tipo  numero  ano
-  - data  protocolo
-  - numero_protocolo ano_protocolo
+  - data  protocolo 
   - assunto
   - interessado  tramitacao
   - texto_integral