diff --git a/cg/cg0200.cpp b/cg/cg0200.cpp
index b5db80a17..8c7290a66 100755
--- a/cg/cg0200.cpp
+++ b/cg/cg0200.cpp
@@ -581,6 +581,7 @@ void TClifo_application::init_query_mode(TMask& m)
     m.set(F_TIPOCF, "F");               
   m.show(F_CODLIST, _liscatven);
   m.show(F_CODLIST1, !_liscatven);
+  m.disable(DLG_CONTRLAV);
 }
 
 void TClifo_application::init_query_insert_mode(TMask& m)
@@ -598,6 +599,7 @@ void TClifo_application::init_modify_mode(TMask& m)
 {
   m.enable_page(4, _gesven);
   m.efield(F_IBAN_STATO).validate(K_TAB); // Decodifica IBAN
+  m.enable(DLG_CONTRLAV, main_app().has_module(LVAUT) && m.get(F_TIPOCF) == "C");
 }
 
 void TClifo_application::set_pnae(TMask& m, TToken_string& nonacc, TToken_string& nonscd)
@@ -984,7 +986,6 @@ bool TClifo_application::user_create() // initvar e arrmask
   _msk->set_handler(DLG_EMAIL, email_handler);
   _msk->set_handler(F_RAGSOC, rsoc_handler);
   _msk->set_handler(DLG_CONTRLAV, contrlav_handler);
-  _msk->enable(DLG_CONTRLAV, main_app().has_module(LVAUT));
 	  
   TSheet_field& ind = _msk->sfield(F_SHEET_G_VEN);
   ind.set_notify(indsp_notify);