diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll
index 433f0e4d..7c7fed3a 100644
Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ
diff --git a/Step/App_Start/Startup.cs b/Step/App_Start/Startup.cs
index 88789b8c..6a74b943 100644
--- a/Step/App_Start/Startup.cs
+++ b/Step/App_Start/Startup.cs
@@ -80,7 +80,7 @@ namespace Step.App_Start
                 TokenEndpointPath = new PathString("/Token"),
                 Provider = new ApplicationOAuthProvider(),
                 // Bearer token expiration time
-                AccessTokenExpireTimeSpan = TimeSpan.FromDays(14),
+                AccessTokenExpireTimeSpan = TimeSpan.FromDays(365),
                 //TODO: In modalità di produzione impostare AllowInsecureHttp = false
                 AllowInsecureHttp = true
             };
diff --git a/Step/wwwroot/assets/styles/base/modals.less b/Step/wwwroot/assets/styles/base/modals.less
index 1ed4f203..32fdfbc4 100644
--- a/Step/wwwroot/assets/styles/base/modals.less
+++ b/Step/wwwroot/assets/styles/base/modals.less
@@ -183,6 +183,7 @@
     align-items: center;
     span{
       word-wrap: break-word;
+      max-width: 445px;
     }
     input{
       margin-left: auto;
diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css
index 73f6a1da..001b3826 100644
--- a/Step/wwwroot/assets/styles/style.css
+++ b/Step/wwwroot/assets/styles/style.css
@@ -127,6 +127,7 @@
 }
 .modal.m155 .content-real-showval span {
   word-wrap: break-word;
+  max-width: 445px;
 }
 .modal.m155 .content-real-showval input {
   margin-left: auto;
diff --git a/Step/wwwroot/src/store/machineStatus.store.ts b/Step/wwwroot/src/store/machineStatus.store.ts
index e716cf91..54128283 100644
--- a/Step/wwwroot/src/store/machineStatus.store.ts
+++ b/Step/wwwroot/src/store/machineStatus.store.ts
@@ -163,8 +163,8 @@ export const machineStatusStore = {
         store.functions = Array.from(store._functions.values());
         Factory.Get(MessageService).publishToChannel("force-ui-update");      
     },
-    UpdateSecurityFunction(store, func: signalr_security.securityFunction) { 
-      if (!store._functions.has(func.id) || store._functions.get(func.name).enabled != func.enabled) {
+    UpdateSecurityFunction(store, func: signalr_security.securityFunction) {
+      if (store._functions.get(func.name) && store._functions.get(func.name).enabled != func.enabled) {
           store._functions.get(func.name).enabled = func.enabled;
           store.functions = Array.from(store._functions.values());
           Factory.Get(MessageService).publishToChannel("force-ui-update");