diff --git a/Plugins/Contrib/CryptoContainer/CryptoContainer/PluginImpl.cs b/Plugins/Contrib/CryptoContainer/CryptoContainer/PluginImpl.cs
index 3be9bebf..a7f4e587 100644
--- a/Plugins/Contrib/CryptoContainer/CryptoContainer/PluginImpl.cs
+++ b/Plugins/Contrib/CryptoContainer/CryptoContainer/PluginImpl.cs
@@ -302,6 +302,10 @@ public BooleanResult AuthenticatedUserGateway(SessionProperties properties)
                 //Registry.SetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\" + sidString, "ProfileImagePath", targetDrive + @":\");
 
 
+                // Save where we mounted the encrypted volume 
+                Registry.SetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Keenou\" + sidString, "encDrive", targetDrive);
+
+
                 // Remove old directory junction (if it's there) 
                 if (Directory.Exists(homeFolder) && !File.Exists(homeFolder + @"\" + "NTUSER.DAT"))
                 {
diff --git a/pGina/src/Core/Settings.cs b/pGina/src/Core/Settings.cs
index efb8f28b..926e9b32 100644
--- a/pGina/src/Core/Settings.cs
+++ b/pGina/src/Core/Settings.cs
@@ -54,7 +54,7 @@ public static void Init()
             s_settings.SetDefault("MaxClients", 25);
             s_settings.SetDefault("TraceMsgTraffic", false);
             s_settings.SetDefault("SessionHelperExe", "pGina.Service.SessionHelper.exe");
-            s_settings.SetDefault("Motd", "pGina Version: %v");
+            s_settings.SetDefault("Motd", "Keenou-pGina Version: %v");
             s_settings.SetDefault("GinaPassthru", false);
             s_settings.SetDefault("ChainedGinaPath", "MSGINA.DLL");
             s_settings.SetDefault("EnableSpecialActionButton", false);
@@ -67,11 +67,12 @@ public static void Init()
             // Default setup is local machine plugin as enabled for auth and gateway
             // Modified to include CryptoContainer Gateway first 
             s_settings.SetDefault("IPluginAuthentication_Order", new string[] { "12FA152D-A2E3-4C8D-9535-5DCD49DFCB6D" });
+            s_settings.SetDefault("IPluginAuthorization_Order", new string[] { "12FA152D-A2E3-4C8D-9535-5DCD49DFCB6D" });
             s_settings.SetDefault("IPluginAuthenticationGateway_Order", new string[] { "14EFCEF3-4D67-44C6-9F28-BB80F1A33827", "12FA152D-A2E3-4C8D-9535-5DCD49DFCB6D" });
             s_settings.SetDefault("14EFCEF3-4D67-44C6-9F28-BB80F1A33827",
                 (int)(Core.PluginLoader.State.GatewayEnabled));
             s_settings.SetDefault("12FA152D-A2E3-4C8D-9535-5DCD49DFCB6D",
-                (int)(Core.PluginLoader.State.AuthenticateEnabled | Core.PluginLoader.State.AuthorizeEnabled | Core.PluginLoader.State.GatewayEnabled));
+                (int)(Core.PluginLoader.State.AuthenticateEnabled | Core.PluginLoader.State.AuthorizeEnabled | Core.PluginLoader.State.GatewayEnabled | Core.PluginLoader.State.ChangePasswordEnabled));
 
             s_settings.SetDefault("UseOriginalUsernameInUnlockScenario", false);
             s_settings.SetDefault("LogonProgressMessage", "Logging on %u...");