diff --git a/ba/ba0100.cpp b/ba/ba0100.cpp
index f7b663abf..a0ce086cd 100755
--- a/ba/ba0100.cpp
+++ b/ba/ba0100.cpp
@@ -60,6 +60,7 @@ protected:  // TApplication
   virtual bool destroy();
   virtual bool menu(MENU_TAG m);
   virtual long handler(WINDOW win, EVENT* ep);
+  virtual void on_firm_change();
   virtual bool test_assistance_year() const;
 
 protected:
@@ -1174,7 +1175,7 @@ bool TMenu_application::choose_study()
     ok = check_user();
     if (ok)
     {
-      set_firm();
+      _menu.set_firm(0);
       _mask->stop_run(K_F9);  // Ricarica maschera
     }
     else
@@ -1608,6 +1609,12 @@ int TMenu_application::do_explore()
   return key == K_QUIT ? -2 : 0;
 }
 
+void TMenu_application::on_firm_change()
+{
+  TConfig cfgs(CONFIG_STUDIO, "Main"); // Forza creazione STUDIO.INI copiandolo eventulamente da PRASSIS.INI
+  TConfig cfgd(CONFIG_DITTA, "ba");    // Forza creazione DITTA.INI copiandolo eventulamente da PRASSID.INI
+}
+
 
 bool TMenu_application::menu(MENU_TAG mt)
 {
diff --git a/ba/ba0101.cpp b/ba/ba0101.cpp
index 093c6094e..6fcef5269 100755
--- a/ba/ba0101.cpp
+++ b/ba/ba0101.cpp
@@ -247,7 +247,7 @@ bool TMenuitem::perform_program() const
 #ifdef _DEMO_
      ok = menu().set_firm(1);
 #else     
-     ok = menu().set_firm();
+     ok = menu().set_firm(0);
 #endif
           
   if (ok)
@@ -515,7 +515,7 @@ bool TMenu::jumpto(TSubmenu* next)
       if (!set_firm(1))
         next = NULL;
 #else    
-      if (!set_firm())
+      if (!set_firm(0))
         next = NULL;
 #endif
     }
diff --git a/ba/ba0101.h b/ba/ba0101.h
index 085f67266..96ded9f62 100755
--- a/ba/ba0101.h
+++ b/ba/ba0101.h
@@ -137,7 +137,7 @@ public:
   
   TSubmenu& current() const { return *_current; }
   TSubmenu* find(const char* name) const { return (TSubmenu*)objptr(name); }
-  bool set_firm(long firm = -1) const;
+  bool set_firm(long firm) const;
   bool jumpto(TSubmenu *next);
   bool jumpto_root();