diff --git a/app/javascript/vue/protocol/protocolMetadata.vue b/app/javascript/vue/protocol/protocolMetadata.vue
index 4ccdac5d5..50354b0ef 100644
--- a/app/javascript/vue/protocol/protocolMetadata.vue
+++ b/app/javascript/vue/protocol/protocolMetadata.vue
@@ -19,7 +19,6 @@
         <button class="btn btn-light" @click="openVersionsModal">{{ i18n.t("protocols.header.versions") }}</button>
         <button v-if="protocol.attributes.urls.publish_url" @click="$emit('publish')" class="btn btn-primary">{{ i18n.t("protocols.header.publish") }}</button>
         <button v-if="protocol.attributes.urls.save_as_draft_url" @click="saveAsdraft" class="btn btn-secondary">{{ i18n.t("protocols.header.save_as_draft") }}</button>
-        <button v-bind:disabled="protocol.attributes.disabled_drafting" v-if="protocol.attributes.disabled_drafting" @click="saveAsdraft" class="btn btn-secondary">{{ i18n.t("protocols.header.save_as_draft") }}</button>
       </div>
     </div>
     <div id="details-container" class="protocol-details collapse in">
diff --git a/app/permissions/team.rb b/app/permissions/team.rb
index 1e9733027..b827d96e8 100644
--- a/app/permissions/team.rb
+++ b/app/permissions/team.rb
@@ -105,11 +105,11 @@ Canaid::Permissions.register_for(Protocol) do
 
   # protocol in repository: restore
   can :restore_protocol_in_repository do |user, protocol|
-    protocol.archived? && protocol.permission_granted?(user, ProtocolPermissions::RESTORE)
+    protocol.archived? && protocol.permission_granted?(user, ProtocolPermissions::MANAGE)
   end
 
   can :archive_protocol_in_repository do |user, protocol|
-    protocol.active? && protocol.permission_granted?(user, ProtocolPermissions::ARCHIVE)
+    protocol.active? && protocol.permission_granted?(user, ProtocolPermissions::MANAGE)
   end
 
   # protocol in repository: copy
@@ -119,7 +119,7 @@ Canaid::Permissions.register_for(Protocol) do
 
   can :publish_protocol_in_repository do |user, protocol|
     protocol.in_repository_draft? &&
-      protocol.permission_granted?(user, ProtocolPermissions::PUBLISH)
+      protocol.permission_granted?(user, ProtocolPermissions::MANAGE)
   end
 
   can :delete_protocol_draft_in_repository do |user, protocol|
diff --git a/app/serializers/protocol_serializer.rb b/app/serializers/protocol_serializer.rb
index f6a66a6c8..167ff01f7 100644
--- a/app/serializers/protocol_serializer.rb
+++ b/app/serializers/protocol_serializer.rb
@@ -8,7 +8,7 @@ class ProtocolSerializer < ActiveModel::Serializer
 
   attributes :name, :id, :urls, :description, :description_view, :updated_at, :in_repository,
              :created_at_formatted, :updated_at_formatted, :added_by, :authors, :keywords, :version, :code,
-             :published, :version_comment, :archived, :disabled_drafting
+             :published, :version_comment, :archived
 
   def updated_at
     object.updated_at.to_i
@@ -84,14 +84,6 @@ class ProtocolSerializer < ActiveModel::Serializer
     !object.in_module?
   end
 
-  def disabled_drafting
-    protocol_types = Protocol.where(name: object.name).pluck(:protocol_type)
-    object.protocol_type != 'in_repository_draft' &&
-      !object.archived &&
-      protocol_types.length > 1 &&
-      protocol_types.include?('in_repository_draft')
-  end
-
   private
 
   def load_from_repo_url
diff --git a/app/views/protocols/index/_general_toolbar.html.erb b/app/views/protocols/index/_general_toolbar.html.erb
index d5163c840..8612e84b5 100644
--- a/app/views/protocols/index/_general_toolbar.html.erb
+++ b/app/views/protocols/index/_general_toolbar.html.erb
@@ -1,25 +1,25 @@
 <template id="protocolGeneralToolbar">
   <div class="left-general-toolbar">
-    <% if can_create_protocols_in_repository?(@current_team) %>
+    <button data-toggle="modal"
+            data-target="#newProtocolModal"
+            <%= 'disabled' if !can_create_protocols_in_repository?(@current_team) %>
+            class="btn btn-primary only-active"
+    >
+      <span class="fas fa-plus"></span>
+      <span class="hidden-xs"><%= t("protocols.index.create_new") %></span>
+    </button>
 
-      <button data-toggle="modal"
-              data-target="#newProtocolModal"
-              class="btn btn-primary only-active"
-      >
-        <span class="fas fa-plus"></span>
-        <span class="hidden-xs"><%= t("protocols.index.create_new") %></span>
+    <div id="protocol-import-group" class="sci-btn-group  only-active" role="group">
+      <button class="btn btn-light btn-open-file <%= 'disabled' unless can_create_protocols_in_repository?(@current_team) %>"
+        data-toggle="dropdown"
+        aria-haspopup="true"
+        aria-expanded="false">
+        <span class="fas fa-upload"></span><span class="hidden-xs"><%= t("protocols.index.import") %></span>
       </button>
-
-      <div id="protocol-import-group" class="sci-btn-group  only-active" role="group">
-        <button class="btn btn-light btn-open-file"
-          data-toggle="dropdown"
-          aria-haspopup="true"
-          aria-expanded="false">
-          <span class="fas fa-upload"></span><span class="hidden-xs"><%= t("protocols.index.import") %></span>
-        </button>
+      <% if can_create_protocols_in_repository?(@current_team) %>
         <ul class="dropdown-menu">
           <li>
-            <a class="btn-link-alt btn-default-link btn-open-file" data-action="import">
+            <a class="btn-link-alt btn-default-link btn-open-file" <%= can_create_protocols_in_repository?(@current_team) ? 'data-action="import"' : 'disabled="disabled"' %>>
               <span><%= t("protocols.index.import_alt") %></span>
               <input type="file" value="" accept=".eln" data-role="import-file-input"
               data-team-id="<%= @current_team.id %>" data-import-url="<%= import_protocols_path %>"
@@ -30,7 +30,7 @@
             <%= link_to t("protocols.index.import_protocols_io"), '', data: { target: '#protocolsioModal', toggle: 'modal' } %>
           </li>
         </ul>
-      </div>
-    <% end %>
+      <% end %>
+    </div>
   </div>
 </template>
diff --git a/app/views/protocols/index/_protocol_versions_modal.html.erb b/app/views/protocols/index/_protocol_versions_modal.html.erb
index 7ef19f6f8..aef8738c8 100644
--- a/app/views/protocols/index/_protocol_versions_modal.html.erb
+++ b/app/views/protocols/index/_protocol_versions_modal.html.erb
@@ -56,7 +56,7 @@
                   >
                   <div class="protocol-comment-message">
                     <div class="view-mode" data-placeholder="<%= t('protocols.index.versions.comment_placeholder') %>"><%= draft.version_comment %></div>
-                    <%= text_area_tag 'version_comment', draft.version_comment, disabled: can_publish_protocol_in_repository?(@protocol), class: 'smart-text-area hidden' %>
+                    <%= text_area_tag 'version_comment', draft.version_comment, disabled: true, class: 'smart-text-area hidden' %>
                   </div>
                   <div class="edit-buttons">
                     <span class="cancel-button btn btn-secondary"><%= t('general.cancel') %></span>
diff --git a/config/initializers/extends/permission_extends.rb b/config/initializers/extends/permission_extends.rb
index f21c26707..943755476 100644
--- a/config/initializers/extends/permission_extends.rb
+++ b/config/initializers/extends/permission_extends.rb
@@ -19,9 +19,6 @@ module PermissionExtends
     %w(
       READ
       READ_ARCHIVED
-      ARCHIVE
-      RESTORE
-      PUBLISH
       MANAGE
       USERS_MANAGE
       MANAGE_DRAFT