diff --git a/AyaNovaSolution.sln b/AyaNovaSolution.sln
index 13dc849..427a593 100644
--- a/AyaNovaSolution.sln
+++ b/AyaNovaSolution.sln
@@ -442,8 +442,8 @@ Global
 		{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Default|x86.Build.0 = Debug|Any CPU
 		{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Release|.NET.ActiveCfg = Release|Any CPU
 		{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Release|.NET.Build.0 = Release|Any CPU
-		{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Release|Any CPU.ActiveCfg = Release|x86
-		{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Release|Any CPU.Build.0 = Release|x86
+		{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Release|WBI.ActiveCfg = Release|Any CPU
diff --git a/source/Plugins/AyaNova.Plugin.V8/Properties/AssemblyInfo.cs b/source/Plugins/AyaNova.Plugin.V8/Properties/AssemblyInfo.cs
index a23d962..43aac7c 100644
--- a/source/Plugins/AyaNova.Plugin.V8/Properties/AssemblyInfo.cs
+++ b/source/Plugins/AyaNova.Plugin.V8/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("8.0.1.0")]
-[assembly: AssemblyFileVersion("8.0.1.0")]
+[assembly: AssemblyVersion("8.0.2.0")]
+[assembly: AssemblyFileVersion("8.0.2.0")]
diff --git a/source/Plugins/AyaNova.Plugin.V8/V8.cs b/source/Plugins/AyaNova.Plugin.V8/V8.cs
index 3c92101..3aa6c00 100644
--- a/source/Plugins/AyaNova.Plugin.V8/V8.cs
+++ b/source/Plugins/AyaNova.Plugin.V8/V8.cs
@@ -35,7 +35,7 @@ namespace AyaNova.PlugIn.V8
 
         public string PluginVersion
         {
-            get { return "8.0.1"; }
+            get { return "8.0.2"; }
         }
 
         public string About
@@ -164,8 +164,9 @@ namespace AyaNova.PlugIn.V8
             util.InitClient();
 
             //here because we logged in fine and can proceed
-
-            //MessageBox.Show("Login successful! JWT is " + util.JWT);
+            if (MessageBox.Show("Warning: if you continue the AyaNova 8 destination server's database will be erased.\r\nAre you sure you want to continue?", "Erase data warning", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) return;
+            if (MessageBox.Show("Last chance: the next step will start migration and the AyaNova 8 target server's data will be erased.\r\nAre you sure you want to proceed?", "Continue migration", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) return;
+           
             //Only one command
             DoExport();
         }
diff --git a/source/WinFormApp/AssemblyInfo.cs b/source/WinFormApp/AssemblyInfo.cs
index dd7a255..0fcf4b9 100644
--- a/source/WinFormApp/AssemblyInfo.cs
+++ b/source/WinFormApp/AssemblyInfo.cs
@@ -62,4 +62,4 @@ using System.Runtime.InteropServices;
 [assembly: log4net.Config.XmlConfigurator(ConfigFile="Log4Net.config",Watch=true)]
 //[assembly: log4net.Config.XmlConfigurator(Watch=true)]
 [assembly: ComVisibleAttribute(false)]
-[assembly: AssemblyFileVersionAttribute("7.6.16.0")]
+[assembly: AssemblyFileVersionAttribute("7.6.17.0")]
diff --git a/source/bizobjects/AyaLib/AssemblyInfo.cs b/source/bizobjects/AyaLib/AssemblyInfo.cs
index 1aecd84..171b1f7 100644
--- a/source/bizobjects/AyaLib/AssemblyInfo.cs
+++ b/source/bizobjects/AyaLib/AssemblyInfo.cs
@@ -64,4 +64,4 @@ using System.Security.Permissions;
 // Configure log4net using the .config file
 //[assembly: log4net.Config.XmlConfigurator(ConfigFile="Log4Net.config",Watch=true)]
 //[assembly: log4net.Config.XmlConfigurator( ConfigFile="Log4Net.config",Watch=true )] 
-[assembly: AssemblyFileVersionAttribute("7.6.16.0")]
+[assembly: AssemblyFileVersionAttribute("7.6.17.0")]
diff --git a/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/GenProcessClientNotifications.cs b/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/GenProcessClientNotifications.cs
index 9c1425a..8e16989 100644
--- a/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/GenProcessClientNotifications.cs
+++ b/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/GenProcessClientNotifications.cs
@@ -88,12 +88,12 @@ namespace GZTW.AyaNova.BLL
                     Chilkat.Email email = new Chilkat.Email();
 
                     //email.SetFromMimeText(n.GetContentAsString);
-                    email.Mailer = "AyaNova service management software licensed to " + AyaBizUtils.REGTO;
+                    email.Mailer = AyaBizUtils.ReplaceBareLineFeeds("AyaNova service management software licensed to " + AyaBizUtils.REGTO);
                     email.Body = AyaBizUtils.ReplaceBareLineFeeds(sMessageFields[1]);//case 4180
-                    email.Subject = sMessageFields[2];
+                    email.Subject = AyaBizUtils.ReplaceBareLineFeeds(sMessageFields[2]);
 
                     //case 1601
-                    string ToAddress = sMessageFields[3];
+                    string ToAddress = AyaBizUtils.ReplaceBareLineFeeds(sMessageFields[3]);
 
                     //case 3808
                    
@@ -117,7 +117,7 @@ namespace GZTW.AyaNova.BLL
                     else
                         email.AddTo("", ToAddress);
 
-                    email.From = sMessageFields[4];
+                    email.From = AyaBizUtils.ReplaceBareLineFeeds(sMessageFields[4]);
 
                     if (nFieldCount > 5)
                     {