diff --git a/Core/MachineDataValidator.cs b/Core/MachineDataValidator.cs
index 271bbbb..4f9142c 100644
--- a/Core/MachineDataValidator.cs
+++ b/Core/MachineDataValidator.cs
@@ -98,15 +98,15 @@ namespace Core
             try
             {
                 // calcolo hashKey da alcuni valori solamente
-                sb.Append($"{machTestData["SystemName"]}|");
-                sb.Append($"{machTestData["ProcessorId"]}|");
-                sb.Append($"{machTestData["PartNumber"]}|");
-                sb.Append($"{machTestData["MACAddress"]}|");
-                sb.Append($"{machTestData["SerialNumber"]}|");
-                sb.Append($"{machTestData["Architecture"]}|");
-                sb.Append($"{machTestData["SoftwareElementID"]}|");
-                sb.Append($"{machTestData["SystemBiosMajorVersion"]}|");
-                sb.Append($"{machTestData["SystemBiosMinorVersion"]}|");
+                sb.Append($"{getDictVal("SystemName")}|");
+                sb.Append($"{getDictVal("ProcessorId")}|");
+                sb.Append($"{getDictVal("PartNumber")}|");
+                sb.Append($"{getDictVal("MACAddress")}|");
+                sb.Append($"{getDictVal("SerialNumber")}|");
+                sb.Append($"{getDictVal("Architecture")}|");
+                sb.Append($"{getDictVal("SoftwareElementID")}|");
+                sb.Append($"{getDictVal("SystemBiosMajorVersion")}|");
+                sb.Append($"{getDictVal("SystemBiosMinorVersion")}|");
                 if (sb.Length > 0)
                 {
                     answ = sb.ToString();
@@ -119,6 +119,21 @@ namespace Core
             return answ;
         }
 
+        /// <summary>
+        /// Recupera info da dictionary
+        /// </summary>
+        /// <param name="keyName"></param>
+        /// <returns></returns>
+        private string getDictVal(string keyName)
+        {
+            string answ = $"{keyName}{keyName}";
+            if (machTestData.ContainsKey(keyName))
+            {
+                answ = machTestData[keyName];
+            }
+            return answ;
+        }
+
         /// <summary>
         /// Esegue reverse delal stringa
         /// </summary>
diff --git a/LiMan.Transfer/Resources/ChangeLog.html b/LiMan.Transfer/Resources/ChangeLog.html
index 619ae00..0018cd9 100644
--- a/LiMan.Transfer/Resources/ChangeLog.html
+++ b/LiMan.Transfer/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>License Manager</i>
-    <h4>Versione: 1.1.2206.0812</h4>
+    <h4>Versione: 1.1.2206.0814</h4>
     <br />
     Note di rilascio:
     <ul>
diff --git a/LiMan.Transfer/Resources/VersNum.txt b/LiMan.Transfer/Resources/VersNum.txt
index b3ef48b..0a2110d 100644
--- a/LiMan.Transfer/Resources/VersNum.txt
+++ b/LiMan.Transfer/Resources/VersNum.txt
@@ -1 +1 @@
-1.1.2206.0812
+1.1.2206.0814
diff --git a/LiMan.Transfer/Resources/manifest.xml b/LiMan.Transfer/Resources/manifest.xml
index 274663c..a5a92c1 100644
--- a/LiMan.Transfer/Resources/manifest.xml
+++ b/LiMan.Transfer/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.1.2206.0812</version>
+  <version>1.1.2206.0814</version>
   <url>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/LiMan.Transfer.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/LiMan.UI/Components/MachineKeyGen.razor b/LiMan.UI/Components/MachineKeyGen.razor
index 9456e0f..d78dac0 100644
--- a/LiMan.UI/Components/MachineKeyGen.razor
+++ b/LiMan.UI/Components/MachineKeyGen.razor
@@ -2,27 +2,37 @@
 
 
 <div class="row">
+    @if (!string.IsNullOrEmpty(@rawData))
+    {
+        @if (!string.IsNullOrEmpty(@keyGen))
+        {
+            <div class="col-12">
+                <CopyToClipboard Text="@keyGen" ShowText="true" />
+            </div>
+        }
+        <div class="col-8">
+            @if (!string.IsNullOrEmpty(@keyGen))
+            {
+                <p>Click to Copy Generated Key to Clipboard</p>
+            }
+        </div>
+        <div class="col-4 text-right">
+            <button class="btn btn-outline-success" type="button" @onclick="() => GenerateKey()">Generate Key from data <i class="fas fa-key"></i></button>
+        </div>
+    }
     <div class="col-12">
         Paste File Content Here
         <div class="input-group mb-2">
-            <input type="text" rows="6" class="form-control" placeholder="license key" aria-label="license key" @bind-value="@rawData">
+            <textarea @bind="rawData" @bind:event="oninput" rows="12" class="form-control" placeholder="paste machine data here" aria-label="paste machine data here" @onchange="() => GenerateKey()" />
         </div>
+        <p class="text-danger">@errorMsg</p>
     </div>
-    <div class="col-12 text-right">
-        <button class="btn btn-outline-success" type="button" @onclick="() => GenerateKey()">Generate Key from data <i class="fas fa-key"></i></button>
-    </div>
-    @if (!string.IsNullOrEmpty(@keyGen))
-    {
-        <div class="col-12">
-            Click to Copy Generated Key to Clipboard
-            <CopyToClipboard Text="@keyGen" ShowText="true" />
-        </div>
-    }
 </div>
 
 @code {
     private string rawData { get; set; } = "";
     private string keyGen { get; set; } = "";
+    private string errorMsg { get; set; } = "";
 
     private async Task GenerateKey()
     {
@@ -33,10 +43,12 @@
             if (cMDV.hasValidData)
             {
                 keyGen = cMDV.machineKeyHash;
+                errorMsg = "";
             }
             else
             {
                 keyGen = "";
+                errorMsg = "Invalid Content Value!!!";
             }
         }
         await Task.Delay(1);
diff --git a/LiMan.UI/LiMan.UI.csproj b/LiMan.UI/LiMan.UI.csproj
index d101271..d99282d 100644
--- a/LiMan.UI/LiMan.UI.csproj
+++ b/LiMan.UI/LiMan.UI.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
-        <Version>1.1.2206.0812</Version>
+        <Version>1.1.2206.0814</Version>
         <RootNamespace>LiMan.UI</RootNamespace>
         <AssemblyName>LiMan.UI</AssemblyName>
     </PropertyGroup>
diff --git a/LiMan.UI/Resources/ChangeLog.html b/LiMan.UI/Resources/ChangeLog.html
index a7fbcb2..2d404a2 100644
--- a/LiMan.UI/Resources/ChangeLog.html
+++ b/LiMan.UI/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>License Manager</i>
-    <h4>Versione: 1.1.2206.0812</h4>
+    <h4>Versione: 1.1.2206.0814</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/LiMan.UI/Resources/VersNum.txt b/LiMan.UI/Resources/VersNum.txt
index b3ef48b..0a2110d 100644
--- a/LiMan.UI/Resources/VersNum.txt
+++ b/LiMan.UI/Resources/VersNum.txt
@@ -1 +1 @@
-1.1.2206.0812
+1.1.2206.0814
diff --git a/LiMan.UI/Resources/manifest.xml b/LiMan.UI/Resources/manifest.xml
index 05f03da..dd5ffec 100644
--- a/LiMan.UI/Resources/manifest.xml
+++ b/LiMan.UI/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.1.2206.0812</version>
+  <version>1.1.2206.0814</version>
   <url>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/LiMan.UI.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
