diff --git a/CASA/micasad/cache/SecretStore.cs b/CASA/micasad/cache/SecretStore.cs
index 081e2d6a..774f48dc 100644
--- a/CASA/micasad/cache/SecretStore.cs
+++ b/CASA/micasad/cache/SecretStore.cs
@@ -946,6 +946,8 @@ namespace sscs.cache
 #else
             string sNewPath = GetUserHomeDirectory() + "\\CASA";
 
+            System.Diagnostics.Trace.WriteLine("Migrate files to " + sNewPath);
+
             if (!Directory.Exists(sNewPath))
             {
                 Directory.CreateDirectory(sNewPath);
diff --git a/CASA/micasad/init/CredMgr.cs b/CASA/micasad/init/CredMgr.cs
index 8dab9945..9ceb05fd 100644
--- a/CASA/micasad/init/CredMgr.cs
+++ b/CASA/micasad/init/CredMgr.cs
@@ -117,6 +117,15 @@ namespace sscs.init
 		private static string GetCredMgrPath()
 		{
 			string sPath = Environment.GetEnvironmentVariable("ProgramFiles");
+
+            // are we on x64?
+            if (sPath.IndexOf("x86") > 0)
+            {                
+                sPath = Environment.GetEnvironmentVariable("SystemDrive") + "\\Program Files";
+            }
+
+            System.Diagnostics.Trace.WriteLine("System Path is " + sPath);
+
 			if (sPath != null)
 			{
 				// look for regsvr32.exe