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 b3418d32..9a279c87 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
@@ -57,6 +57,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_50D22F6A568E498D84459FC72B66615C"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_677B016062384F4C8A73EC952CBCFD76"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -70,7 +76,7 @@
         "Entry"
         {
         "MsmKey" = "8:_71C343EBC4935F8914C3145115EDEC4A"
-        "OwnerKey" = "8:_8EE6563CF41048A0A19C889150F5A072"
+        "OwnerKey" = "8:_FBCAB4866DF34F0C8E00056A526C0A9A"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -87,14 +93,14 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_8EE6563CF41048A0A19C889150F5A072"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_86C4F126961F4D628A361FE9B9B8B329"
+        "OwnerKey" = "8:_8292EFFD84EF46C6BD2F1F3E20808684"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_ABC416054C27440FA6009021C0AF9640"
-        "OwnerKey" = "8:_8292EFFD84EF46C6BD2F1F3E20808684"
+        "MsmKey" = "8:_FBCAB4866DF34F0C8E00056A526C0A9A"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -238,6 +244,26 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_50D22F6A568E498D84459FC72B66615C"
+            {
+            "SourcePath" = "8:..\\client.conf"
+            "TargetName" = "8:client.conf"
+            "Tag" = "8:"
+            "Folder" = "8:_24DA90392089420889094EC07EB4F28C"
+            "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:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_677B016062384F4C8A73EC952CBCFD76"
             {
             "SourcePath" = "8:..\\windows\\authtoken.lib"
@@ -434,7 +460,7 @@
         }
         "MergeModule"
         {
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_ABC416054C27440FA6009021C0AF9640"
+            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_86C4F126961F4D628A361FE9B9B8B329"
             {
             "UseDynamicProperties" = "11:FALSE"
             "IsDependency" = "11:TRUE"
@@ -462,7 +488,7 @@
         {
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_0C0B5ECE6E9C47F1A1F13B58141B5DC8"
             {
-            "SourcePath" = "8:..\\windows\\Release\\authtoken.dll"
+            "SourcePath" = "8:..\\windows\\Debug\\authtoken.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_01897726E7804A3B875B67A1C2692147"
@@ -490,7 +516,7 @@
             }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_14879C6DA33C4224AD56983018EDC817"
             {
-            "SourcePath" = "8:..\\windows\\Release\\authtoken.dll"
+            "SourcePath" = "8:..\\windows\\Debug\\authtoken.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_E092F841E4D04920B053C3F6A5151BA2"
@@ -518,7 +544,7 @@
             }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_409269C4EABE4CC18045A808B7B1C104"
             {
-            "SourcePath" = "8:..\\mechanisms\\krb5\\windows\\Release\\krb5mech.dll"
+            "SourcePath" = "8:..\\mechanisms\\krb5\\windows\\Debug\\krb5mech.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_F5F5F604B81645F8B6463F7A7D6A53AD"
@@ -546,7 +572,7 @@
             }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8292EFFD84EF46C6BD2F1F3E20808684"
             {
-            "SourcePath" = "8:..\\csharp\\Novell.Casa.Authtoken\\obj\\Release\\Novell.Casa.Client.Auth.dll"
+            "SourcePath" = "8:..\\csharp\\Novell.Casa.Authtoken\\obj\\Debug\\Novell.Casa.Client.Auth.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_8E0BBDD021EA45308BD98380F28EB7F6"
@@ -572,9 +598,9 @@
                 {
                 }
             }
-            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8EE6563CF41048A0A19C889150F5A072"
+            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_FBCAB4866DF34F0C8E00056A526C0A9A"
             {
-            "SourcePath" = "8:..\\mechanisms\\pwd\\windows\\Release\\pwmech.dll"
+            "SourcePath" = "8:..\\mechanisms\\pwd\\windows\\Debug\\pwmech.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 fc866dac..cde7b5cf 100644
--- a/CASA-auth-token/non-java/client/client.vcproj
+++ b/CASA-auth-token/non-java/client/client.vcproj
@@ -165,6 +165,9 @@ copy $(SolutionDir)client\windows\authtoken.lib \"Program Files"\novel
 						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath=".\client.conf">
+			</File>
 			<File
 				RelativePath=".\config.c">
 			</File>
diff --git a/CASA-auth-token/non-java/client/csharp/Novell.Casa.Authtoken/Novell.Casa.Client.csproj.user b/CASA-auth-token/non-java/client/csharp/Novell.Casa.Authtoken/Novell.Casa.Client.csproj.user
index 53b5d76a..1b7f6272 100644
--- a/CASA-auth-token/non-java/client/csharp/Novell.Casa.Authtoken/Novell.Casa.Client.csproj.user
+++ b/CASA-auth-token/non-java/client/csharp/Novell.Casa.Authtoken/Novell.Casa.Client.csproj.user
@@ -1,5 +1,5 @@
 <VisualStudioProject>
-    <CSHARP LastOpenVersion = "7.10.3077" >
+    <CSHARP LastOpenVersion = "7.10.6030" >
         <Build>
             <Settings ReferencePath = "" >
                 <Config
diff --git a/CASA-auth-token/non-java/client/csharp/test/TestClientAuth.csproj.user b/CASA-auth-token/non-java/client/csharp/test/TestClientAuth.csproj.user
index e4603d75..bc7c0943 100644
--- a/CASA-auth-token/non-java/client/csharp/test/TestClientAuth.csproj.user
+++ b/CASA-auth-token/non-java/client/csharp/test/TestClientAuth.csproj.user
@@ -1,5 +1,5 @@
 <VisualStudioProject>
-    <CSHARP LastOpenVersion = "7.10.3077" >
+    <CSHARP LastOpenVersion = "7.10.6030" >
         <Build>
             <Settings ReferencePath = "" >
                 <Config