diff --git a/CASA-auth-token/client/csharp-api/Novell.Casa.Authtoken/AssemblyInfo.cs b/CASA-auth-token/client/csharp-api/Novell.Casa.Authtoken/AssemblyInfo.cs
index 2548f91a..357705ee 100644
--- a/CASA-auth-token/client/csharp-api/Novell.Casa.Authtoken/AssemblyInfo.cs
+++ b/CASA-auth-token/client/csharp-api/Novell.Casa.Authtoken/AssemblyInfo.cs
@@ -52,6 +52,6 @@ using System.Runtime.CompilerServices;
 //   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
 //       documentation for more information on this.
 //
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("../../AuthToken.snk")]
-[assembly: AssemblyKeyName("")]
+//[assembly: AssemblyDelaySign(false)]
+//[assembly: AssemblyKeyFile("../../AuthToken.snk")]
+//[assembly: AssemblyKeyName("")]
diff --git a/CASA-auth-token/client/csharp-api/Novell.Casa.Authtoken/Novell.Casa.Client.csproj b/CASA-auth-token/client/csharp-api/Novell.Casa.Authtoken/Novell.Casa.Client.csproj
index 6d7cc5a0..b8799ce8 100644
--- a/CASA-auth-token/client/csharp-api/Novell.Casa.Authtoken/Novell.Casa.Client.csproj
+++ b/CASA-auth-token/client/csharp-api/Novell.Casa.Authtoken/Novell.Casa.Client.csproj
@@ -11,8 +11,7 @@
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>Novell.Casa.Client.Auth</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>AuthToken.snk</AssemblyOriginatorKeyFile>
     <DefaultClientScript>JScript</DefaultClientScript>
     <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
@@ -26,6 +25,7 @@
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -95,6 +95,9 @@
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="AuthToken.snk" />
+  </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
diff --git a/CASA-auth-token/client/package/windows/authtokenclient_msi/authtokenclient_msi.vdproj b/CASA-auth-token/client/package/windows/authtokenclient_msi/authtokenclient_msi.vdproj
index 71f12cb9..6e4d6e0f 100644
--- a/CASA-auth-token/client/package/windows/authtokenclient_msi/authtokenclient_msi.vdproj
+++ b/CASA-auth-token/client/package/windows/authtokenclient_msi/authtokenclient_msi.vdproj
@@ -46,10 +46,10 @@
             "ComponentsUrl" = "8:"
                 "Items"
                 {
-                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.2.0"
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1"
                     {
-                    "Name" = "8:Windows Installer 2.0"
-                    "ProductCode" = "8:Microsoft.Windows.Installer.2.0"
+                    "Name" = "8:Windows Installer 3.1"
+                    "ProductCode" = "8:Microsoft.Windows.Installer.3.1"
                     }
                 }
             }
@@ -78,10 +78,10 @@
             "ComponentsUrl" = "8:"
                 "Items"
                 {
-                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.2.0"
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1"
                     {
-                    "Name" = "8:Windows Installer 2.0"
-                    "ProductCode" = "8:Microsoft.Windows.Installer.2.0"
+                    "Name" = "8:Windows Installer 3.1"
+                    "ProductCode" = "8:Microsoft.Windows.Installer.3.1"
                     }
                 }
             }
@@ -171,7 +171,7 @@
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:authtokenclient"
         "ProductCode" = "8:{6D3AAA36-871A-4427-9311-FC3FE2F17511}"
-        "PackageCode" = "8:{8A0F81D0-7370-4E73-B3F9-768F905E08D5}"
+        "PackageCode" = "8:{AF5CA0D9-0CFE-4EDF-9B54-8B936910C236}"
         "UpgradeCode" = "8:{69C5F129-788A-4487-9397-331C0A313A2D}"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:FALSE"
diff --git a/CASA-auth-token/client/package/windows/authtokenclientdevel_msi/authtokenclientdevel_msi.vdproj b/CASA-auth-token/client/package/windows/authtokenclientdevel_msi/authtokenclientdevel_msi.vdproj
index 4101b5d6..554a1ea6 100644
--- a/CASA-auth-token/client/package/windows/authtokenclientdevel_msi/authtokenclientdevel_msi.vdproj
+++ b/CASA-auth-token/client/package/windows/authtokenclientdevel_msi/authtokenclientdevel_msi.vdproj
@@ -37,6 +37,27 @@
         "PrivateKeyFile" = "8:"
         "TimeStampServer" = "8:"
         "InstallerBootstrapper" = "3:2"
+            "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
+            {
+            "Enabled" = "11:TRUE"
+            "PromptEnabled" = "11:TRUE"
+            "PrerequisitesLocation" = "2:1"
+            "Url" = "8:"
+            "ComponentsUrl" = "8:"
+                "Items"
+                {
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Net.Framework.2.0"
+                    {
+                    "Name" = "8:.NET Framework 2.0"
+                    "ProductCode" = "8:Microsoft.Net.Framework.2.0"
+                    }
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1"
+                    {
+                    "Name" = "8:Windows Installer 3.1"
+                    "ProductCode" = "8:Microsoft.Windows.Installer.3.1"
+                    }
+                }
+            }
         }
         "Release"
         {
@@ -53,6 +74,27 @@
         "PrivateKeyFile" = "8:"
         "TimeStampServer" = "8:"
         "InstallerBootstrapper" = "3:2"
+            "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
+            {
+            "Enabled" = "11:TRUE"
+            "PromptEnabled" = "11:TRUE"
+            "PrerequisitesLocation" = "2:1"
+            "Url" = "8:"
+            "ComponentsUrl" = "8:"
+                "Items"
+                {
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Net.Framework.2.0"
+                    {
+                    "Name" = "8:.NET Framework 2.0"
+                    "ProductCode" = "8:Microsoft.Net.Framework.2.0"
+                    }
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1"
+                    {
+                    "Name" = "8:Windows Installer 3.1"
+                    "ProductCode" = "8:Microsoft.Windows.Installer.3.1"
+                    }
+                }
+            }
         }
     }
     "Deployable"