diff --git a/geonode/documents/templates/layouts/doc_panels.html b/geonode/documents/templates/layouts/doc_panels.html
index 1c1ab157517..d91eec48609 100644
--- a/geonode/documents/templates/layouts/doc_panels.html
+++ b/geonode/documents/templates/layouts/doc_panels.html
@@ -316,7 +316,7 @@
                                     </div>
                                 {% endblock doc_title %}
                                 {% block doc_links %}
-                                    <div id="req_item">                                  
+                                    <div id="req_item">
                                       <span><label for="{{ document_form.title|id }}">{{ document_form.links.label }}</label></span>
                                       {{ document_form.links }}
                                     </div>
@@ -468,7 +468,7 @@
                                         <span><label for="{{ document_form.constraints_other|id }}">{{ document_form.constraints_other.label }}</label></span>
                                         <!--<p class="xxs-font-size">(Other restrictions and legal prerequisites for accessing or use data and metadata)</p>-->
                                         {{ document_form.constraints_other }}
-                                    </div> 
+                                    </div>
                                     {% endblock doc_constraints_other %}
                                 </div>
                             </div>
@@ -560,7 +560,6 @@
                 </div>
             </div>
             <div class="col-xs-12 col-lg-3">
-              {% block document_poc %}
               <div class="panel panel-default" style="margin-top: 5px">
                 <div class="panel-heading">{% trans "Responsible Parties" %}</div>
                   {% block document_poc %}
@@ -597,7 +596,6 @@
                 </div>
               </div>
               {% endblock document_more_contact_roles %}
-              {% endblock %}
 
               <div class="panel panel-default">
                 <div class="panel-heading">{% trans "Responsible and Permissions" %}</div>
@@ -620,7 +618,7 @@
       </div>
     </div>
     {% block extra_metadata_content %}
-    {% endblock %}
+    {% endblock extra_metadata_content %}
   </div>
   {% endblock ownership %}
 
diff --git a/geonode/geoapps/templates/layouts/app_panels.html b/geonode/geoapps/templates/layouts/app_panels.html
index 85765fc7c19..7b1d5bfa8e2 100644
--- a/geonode/geoapps/templates/layouts/app_panels.html
+++ b/geonode/geoapps/templates/layouts/app_panels.html
@@ -510,6 +510,7 @@
               {% endblock %}
               <div class="panel panel-default">
                   <div class="panel-heading">{% trans "Responsible and Permissions" %}</div>
+                  {% block geoapp_owner %}
                   <div class="panel-body">
                       <div>
                         <span><label for="{{ geoapp_form.owner|id }}">{{ geoapp_form.owner.label }}</label></span>