diff --git a/app/controllers/admin/communication/extranets/documents_controller.rb b/app/controllers/admin/communication/extranets/documents_controller.rb
index dd96762fce3a07251f3dc951a2768eec962609e7..3bcfdddfd0f94cf9b5e7a332e4ad98ddf7093cb9 100644
--- a/app/controllers/admin/communication/extranets/documents_controller.rb
+++ b/app/controllers/admin/communication/extranets/documents_controller.rb
@@ -57,7 +57,8 @@ class Admin::Communication::Extranets::DocumentsController < Admin::Communicatio
     params.require(:communication_extranet_document)
     .permit(
       :name, :published, :published_at, :slug,
-      :file, :file_delete
+      :file, :file_delete,
+      :category_id, :kind_id
     )
     .merge(
       university_id: current_university.id
diff --git a/app/views/admin/communication/extranets/documents/_form.html.erb b/app/views/admin/communication/extranets/documents/_form.html.erb
index 063aa8dc6bfef2611428dd28009d2e95cb9c0cd2..e913853194144c7e91bf7bd37d9322581a5b8173 100644
--- a/app/views/admin/communication/extranets/documents/_form.html.erb
+++ b/app/views/admin/communication/extranets/documents/_form.html.erb
@@ -12,13 +12,11 @@
     <div class="col-md-4">
       <%= osuny_panel t('metadata') do %>
         <% if can? :publish, document %>
-          <div class="row pure__row--small">
-            <div class="col-6">
-              <%= f.input :published %>
-            </div>
-          </div>
+          <%= f.input :published %>
           <%= f.input :published_at, html5: true, as: :date %>
         <% end %>
+        <%= f.association :kind, collection: @extranet.document_kinds, include_blank: false %>
+        <%= f.association :category, collection: @extranet.document_categories, include_blank: false %>
       <% end %>
     </div>
   </div>
diff --git a/app/views/admin/communication/extranets/documents/show.html.erb b/app/views/admin/communication/extranets/documents/show.html.erb
index fbc17175fb3036454f659d82484f6048cda21576..1b7e2da240f7e63e5e79fe31aff96dbab0312350 100644
--- a/app/views/admin/communication/extranets/documents/show.html.erb
+++ b/app/views/admin/communication/extranets/documents/show.html.erb
@@ -9,16 +9,20 @@
     </div>
     <div class="col-xl-4">
       <%= osuny_panel t('metadata') do %>
-        <div class="row pure__row--small">
-          <div class="col-6">
-            <%= osuny_label Communication::Extranet::Document.human_attribute_name('published') %>
-            <p>
-              <%= t @document.published %><% if @document.published %>,
-                <%= l @document.published_at.to_date, format: :long %>
-              <% end %>
-            </p>
-          </div>
-        </div>
+        <%= osuny_label Communication::Extranet::Document.human_attribute_name('published') %>
+        <p>
+          <%= t @document.published %><% if @document.published %>,
+            <%= l @document.published_at.to_date, format: :long %>
+          <% end %>
+        </p>
+        <% if @document.category %>
+          <%= osuny_label Communication::Extranet::Document.human_attribute_name('category') %>
+          <p><%= link_to @document.category, [:admin, @document.category] %></p>
+        <% end %>
+        <% if @document.kind %>
+          <%= osuny_label Communication::Extranet::Document.human_attribute_name('kind') %>
+          <p><%= link_to @document.kind, [:admin, @document.kind] %></p>
+        <% end %>
       <% end %>
     </div>
   </div>