diff --git a/src/conf/opportunity-types.php b/src/conf/opportunity-types.php
index 1941a15ffb..c41ebd229b 100644
--- a/src/conf/opportunity-types.php
+++ b/src/conf/opportunity-types.php
@@ -248,12 +248,13 @@ function compareNamesOpportunity ($item1, $item2) {
         'isModel' => array(
             'type' => 'integer',
             'label' => \MapasCulturais\i::__('É modelo?'),
-            'default_value' => 0,
+            'default_value' => 0
         ),
-        'modelType' => array(
+        'isModelOfficial' => array(
             'type' => 'integer',
-            'label' => \MapasCulturais\i::__('Tipo de modelo'),
+            'label' => \MapasCulturais\i::__('É modelo oficial?'),
         ),
+        
     ),
     'items' => $items,
     
diff --git a/src/core/Traits/EntityGenerateModel.php b/src/core/Traits/EntityGenerateModel.php
index 6c336399e7..45630c7812 100644
--- a/src/core/Traits/EntityGenerateModel.php
+++ b/src/core/Traits/EntityGenerateModel.php
@@ -140,7 +140,7 @@ private function generateMetadata() : void
         }
 
         $this->opportunityModel->setMetadata('isModel', 1);
-        $this->opportunityModel->setMetadata('modelType', 1);
+        $this->opportunityModel->setMetadata('isModelOfficial', 0);
 
         $this->opportunityModel->saveTerms();
     }
diff --git a/src/modules/Entities/components/entity-actions/template.php b/src/modules/Entities/components/entity-actions/template.php
index 96fbdad3b8..c8a4afc4c5 100644
--- a/src/modules/Entities/components/entity-actions/template.php
+++ b/src/modules/Entities/components/entity-actions/template.php
@@ -58,9 +58,10 @@
                         <p><?php i::_e('Deseja continuar?') ?></p>
                     </template>
                 </mc-confirm-button>
-
-                <opportunity-create-model :entity="entity" classes="col-12"></opportunity-create-model>
-                
+                <div v-if="entity.currentUserPermissions?.modify && entity.status != -2 && entity.__objectType == 'opportunity'">
+                    <opportunity-create-model :entity="entity" classes="col-12"></opportunity-create-model>
+                </div>
+ 
                 <?php $this->applyTemplateHook('entity-actions--primary', 'end') ?>
             </div>
             <?php $this->applyTemplateHook('entity-actions--leftGroupBtn', 'after'); ?>
diff --git a/src/modules/Entities/components/opportunity-create-model/script.js b/src/modules/Entities/components/opportunity-create-model/script.js
index b14d1a59ab..48aa662fd8 100644
--- a/src/modules/Entities/components/opportunity-create-model/script.js
+++ b/src/modules/Entities/components/opportunity-create-model/script.js
@@ -24,12 +24,13 @@ app.component('opportunity-create-model', {
 
     methods: {
         async save() {
+            this.__processing = this.text('Gerando modelo...');
+
             const api = new API(this.entity.__objectType);
 
             let objt = this.formData;
             objt.entityId = this.entity.id;
             
-
             let error = null;
 
             if (error = this.validade(objt)) {
diff --git a/src/modules/Entities/components/opportunity-create-model/template.php b/src/modules/Entities/components/opportunity-create-model/template.php
index 18f1ff8938..4c0837446a 100644
--- a/src/modules/Entities/components/opportunity-create-model/template.php
+++ b/src/modules/Entities/components/opportunity-create-model/template.php
@@ -12,7 +12,7 @@
 ?>
 <div class="col-12">
     <mc-modal title="<?= i::__('Salvar modelo') ?>">
-        <template v-if="!sendSuccess" #default>
+        <template #default>
             <p>Para salvar um modelo, preencha os campos abaixo.</p><br>
             <div>
                 <div class="field">
@@ -31,9 +31,6 @@
             <button class="button button--primary" @click="save(modal)"><?= i::__('Salvar modelo') ?></button>
             <button class="button button--text button--text-del" @click="modal.close()"><?= i::__('cancelar') ?></button>
         </template>
-        <template  v-if="sendSuccess"  #actions="modal">
-            <button class="button button--primary" @click="modal.close()"><?= i::__('Fechar') ?></button>
-        </template>
 
         <template #button="modal">
             <button type="button" @click="modal.open();" class="button button--icon button--sm"><?= i::__('Salvar modelo') ?></button>
diff --git a/src/modules/Entities/components/opportunity-create-model/texts.php b/src/modules/Entities/components/opportunity-create-model/texts.php
index 7094b5a0e8..453df2b0a0 100644
--- a/src/modules/Entities/components/opportunity-create-model/texts.php
+++ b/src/modules/Entities/components/opportunity-create-model/texts.php
@@ -5,5 +5,6 @@
 return [
     'Recaptcha inválida' => i::__('Recaptcha inválida'),
     'Todos os campos são obrigatorio' => i::__('Todos os campos são obrigatorio'),
-    'Modelo salvo com sucesso' => i::__('Modelo salvo com sucesso'),
+    'Modelo gerado com sucesso' => i::__('Modelo gerado com sucesso'),
+    'Gerando modelo...' => i::__('Gerando modelo...'),
 ];