diff --git a/CASA/CASA.changes b/CASA/CASA.changes
index e5f500c2..a9483ad5 100644
--- a/CASA/CASA.changes
+++ b/CASA/CASA.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul 15 16:26:21 MDT 2008 - jnorman@novell.com
+
+- Bug 409364. Fixed RemoveKey.cs to extract proper LUID
+  Affects windows only.
+
 -------------------------------------------------------------------
 Wed Jun 25 10:46:21 MDT 2008 - jnorman@novell.com
 
diff --git a/CASA/micasad/verbs/RemoveKey.cs b/CASA/micasad/verbs/RemoveKey.cs
index a32591d0..7dae302f 100644
--- a/CASA/micasad/verbs/RemoveKey.cs
+++ b/CASA/micasad/verbs/RemoveKey.cs
@@ -135,9 +135,9 @@ namespace sscs.verbs
                 {
 
                     // WINDOWS LUID
-                    // System Services, like DLU create fake UIDs, store credentials and then want to read that data.
-                    luidLow = BitConverter.ToInt32(inBuf, 18 + ((int)keyChainIdLen) + ((int)secretIdLen) + 8);
-                    luidHigh = BitConverter.ToInt32(inBuf, 18 + ((int)keyChainIdLen) + ((int)secretIdLen) + 12);
+                    // System Services, like DLU create fake UIDs, store credentials and then want to read that data.
+                    luidLow = BitConverter.ToInt32(inBuf, 22 + ((int)keyChainIdLen) + ((int)secretIdLen) + ((int)keyLen) + 8);
+                    luidHigh = BitConverter.ToInt32(inBuf, 22 + ((int)keyChainIdLen) + ((int)secretIdLen) + ((int)keyLen) + 12);
 
                     // this code is for ZEN.  Here we switch to a keychain who's ID is the LUID of the user logging in.  
                     // ZEN processes run as system and pass the LUID in the extension parameter.