diff --git a/CASA-auth-token/non-java/client/authtokenclient_msi/authtokenclient_msi.vdproj b/CASA-auth-token/non-java/client/authtokenclient_msi/authtokenclient_msi.vdproj
index 07135092..1525e0cf 100644
--- a/CASA-auth-token/non-java/client/authtokenclient_msi/authtokenclient_msi.vdproj
+++ b/CASA-auth-token/non-java/client/authtokenclient_msi/authtokenclient_msi.vdproj
@@ -133,7 +133,7 @@
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:authtokenclient"
         "ProductCode" = "8:{6D3AAA36-871A-4427-9311-FC3FE2F17511}"
-        "PackageCode" = "8:{197B9AC3-1D6A-4EA8-AC8A-C7695F57A28F}"
+        "PackageCode" = "8:{4F7846D3-7607-463B-8BA7-A76832D29411}"
         "UpgradeCode" = "8:{69C5F129-788A-4487-9397-331C0A313A2D}"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:FALSE"
@@ -489,28 +489,6 @@
             "Attributes" = "3:1"
                 "Dialogs"
                 {
-                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_7F0506CDE05C426E9A69E1F0F6A1B9A4"
-                    {
-                    "Sequence" = "3:200"
-                    "DisplayName" = "8:Installation Folder"
-                    "UseDynamicProperties" = "11:TRUE"
-                    "IsDependency" = "11:FALSE"
-                    "SourcePath" = "8:<VsdDialogDir>\\VsdFolderDlg.wid"
-                        "Properties"
-                        {
-                            "BannerBitmap"
-                            {
-                            "Name" = "8:BannerBitmap"
-                            "DisplayName" = "8:#1001"
-                            "Description" = "8:#1101"
-                            "Type" = "3:8"
-                            "ContextData" = "8:Bitmap"
-                            "Attributes" = "3:4"
-                            "Setting" = "3:1"
-                            "UsePlugInResources" = "11:TRUE"
-                            }
-                        }
-                    }
                     "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_E227037047AF41C394E3138699F6DD62"
                     {
                     "Sequence" = "3:300"
diff --git a/CASA-auth-token/non-java/client/authtokenclient_msm/authtokenclient_msm.vdproj b/CASA-auth-token/non-java/client/authtokenclient_msm/authtokenclient_msm.vdproj
index 420a9086..0f8c97b6 100644
--- a/CASA-auth-token/non-java/client/authtokenclient_msm/authtokenclient_msm.vdproj
+++ b/CASA-auth-token/non-java/client/authtokenclient_msm/authtokenclient_msm.vdproj
@@ -39,20 +39,44 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_313DE095D13281AF91A64E3F3D472413"
+        "OwnerKey" = "8:_9A2FC85FE99C48E8AD1E4813BE33A03A"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_409269C4EABE4CC18045A808B7B1C104"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_677B016062384F4C8A73EC952CBCFD76"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
+        "MsmKey" = "8:_71C343EBC4935F8914C3145115EDEC4A"
+        "OwnerKey" = "8:_0C0B5ECE6E9C47F1A1F13B58141B5DC8"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_71C343EBC4935F8914C3145115EDEC4A"
+        "OwnerKey" = "8:_409269C4EABE4CC18045A808B7B1C104"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_9A2FC85FE99C48E8AD1E4813BE33A03A"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_DB9D7F0710B44F858325E4EFCCB2EEB3"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_FE85A5D48B5A23F3077871E9FD2378DE"
+        "OwnerKey" = "8:_0C0B5ECE6E9C47F1A1F13B58141B5DC8"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -164,6 +188,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_313DE095D13281AF91A64E3F3D472413"
+            {
+            "SourcePath" = "8:Secur32.dll"
+            "TargetName" = "8:Secur32.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_F5F5F604B81645F8B6463F7A7D6A53AD"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_677B016062384F4C8A73EC952CBCFD76"
             {
             "SourcePath" = "8:..\\windows\\authtoken.lib"
@@ -184,6 +228,46 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_71C343EBC4935F8914C3145115EDEC4A"
+            {
+            "SourcePath" = "8:micasa.dll"
+            "TargetName" = "8:micasa.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_01897726E7804A3B875B67A1C2692147"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_FE85A5D48B5A23F3077871E9FD2378DE"
+            {
+            "SourcePath" = "8:WINHTTP.dll"
+            "TargetName" = "8:WINHTTP.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_01897726E7804A3B875B67A1C2692147"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
         }
         "FileType"
         {
@@ -315,7 +399,7 @@
         {
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_0C0B5ECE6E9C47F1A1F13B58141B5DC8"
             {
-            "SourcePath" = "8:..\\windows\\Debug\\authtoken.dll"
+            "SourcePath" = "8:..\\windows\\debug\\authtoken.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_01897726E7804A3B875B67A1C2692147"
@@ -341,9 +425,9 @@
                 {
                 }
             }
-            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_9A2FC85FE99C48E8AD1E4813BE33A03A"
+            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_409269C4EABE4CC18045A808B7B1C104"
             {
-            "SourcePath" = "8:..\\mechanisms\\krb5\\windows\\Debug\\krb5mech.dll"
+            "SourcePath" = "8:..\\mechanisms\\pwd\\windows\\Debug\\pwmech.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_F5F5F604B81645F8B6463F7A7D6A53AD"
@@ -369,9 +453,9 @@
                 {
                 }
             }
-            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_DB9D7F0710B44F858325E4EFCCB2EEB3"
+            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_9A2FC85FE99C48E8AD1E4813BE33A03A"
             {
-            "SourcePath" = "8:..\\mechanisms\\krb5\\windows\\Debug\\krb5mech.dll"
+            "SourcePath" = "8:..\\mechanisms\\krb5\\windows\\debug\\krb5mech.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_F5F5F604B81645F8B6463F7A7D6A53AD"
diff --git a/CASA-auth-token/non-java/client/client.vcproj b/CASA-auth-token/non-java/client/client.vcproj
index ad9dbe87..b3770a1e 100644
--- a/CASA-auth-token/non-java/client/client.vcproj
+++ b/CASA-auth-token/non-java/client/client.vcproj
@@ -21,7 +21,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D &quot;XML_STATIC&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;.\windows;..\include;&quot;\Program Files\novell\casa\include&quot;;&quot;..\..\..\Expat-2.0.0\source\lib&quot;"
+				AdditionalIncludeDirectories=".;.\windows;..\include;&quot;\Program Files\novell\casa\include&quot;;&quot;..\..\..\..\Expat-2.0.0\source\lib&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -39,7 +39,7 @@
 				AdditionalDependencies="ws2_32.lib winhttp.lib libexpatml.lib micasa.lib"
 				OutputFile="$(OutDir)/authtoken.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;\Program Files\Novell\CASA\lib&quot;;&quot;..\..\..\Expat-2.0.0\StaticLibs&quot;"
+				AdditionalLibraryDirectories="&quot;\Program Files\Novell\CASA\lib&quot;;&quot;..\..\..\..\Expat-2.0.0\StaticLibs&quot;"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/client.pdb"
 				SubSystem="0"