diff --git a/ba/ba1500.cpp b/ba/ba1500.cpp
index 3a0c3d817..58ecf453c 100755
--- a/ba/ba1500.cpp
+++ b/ba/ba1500.cpp
@@ -107,13 +107,13 @@ int TInformazione_moduli::get_module_by_order(int index)
 // Calcola il produttore ufficiale di module
 TDongleType TInformazione_moduli::get_owner(int module) const
 {   
-  const int aut[] = { CMAUT, ATAUT, POAUT, AFAUT, TCAUT, TMAUT, 
-                      VEAUT, MGAUT, ORAUT, EFAUT, DBAUT, PRAUT, SVAUT, -1 };
-  for (int a = 0; aut[a] >= 0; a++)
-    if (module == aut[a])
-      return _aga_dongle;
+//  const int aut[] = { CMAUT, ATAUT, POAUT, AFAUT, TCAUT, TMAUT, 
+//                      VEAUT, MGAUT, ORAUT, EFAUT, DBAUT, PRAUT, SVAUT, -1 };
+//  for (int a = 0; aut[a] >= 0; a++)
+//    if (module == aut[a])
+    return _aga_dongle;
       
-  return _prassi_dongle;
+//  return _prassi_dongle;
 }
 
 // Testa se module appartiene al produttore owner
@@ -506,8 +506,8 @@ void TAttivazione_moduli::garble(word n, TString& str) const
   
   word data[4];
   data[0] = word(_msk->get_int(F_SN));
-  data[1] = n;
-  data[2] = word(val >> 16);
+  data[1] = word(val >> 16);
+  data[2] = n;
   data[3] = word(val & 0xFFFF);
   garble(data);
   str.format("%04X%04X", data[0], data[1]);
@@ -519,9 +519,9 @@ void TAttivazione_moduli::garble_user(word u, TString& str) const
   const long val = today.date2julian();
   
   word data[4];
-  data[0] = word(_msk->get_int(F_SN));
-  data[1] = u;
-  data[2] = word(val >> 16);
+  data[0] = u;
+  data[1] = word(val >> 16);
+  data[2] = word(_msk->get_int(F_SN));
   data[3] = word(val & 0xFFFF);
   garble(data);
   str.format("%04X%04X", data[0], data[1]);
@@ -533,9 +533,9 @@ void TAttivazione_moduli::garble_year(word y, TString& str) const
   const long val = today.date2julian();
   
   word data[4];
-  data[0] = y;
-  data[1] = word(_msk->get_int(F_SN));
-  data[2] = word(val >> 16);
+  data[0] = word(_msk->get_int(F_SN));
+  data[1] = word(val >> 16);
+  data[2] = y;
   data[3] = word(val & 0xFFFF);
   garble(data);
   str.format("%04X%04X", data[0], data[1]);