3 files changed, 19 insertions, 2 deletions
diff --git a/src/windows/identity/uilib/configui.c b/src/windows/identity/uilib/configui.c
index ae8cd2f7c..9aa88cd28 100644
--- a/src/windows/identity/uilib/configui.c
+++ b/src/windows/identity/uilib/configui.c
@@ -190,6 +190,12 @@ khui_cfg_register(khui_config_node vparent,
 
     EnterCriticalSection(&cs_cfgui);
     TADDCHILD(parent, node);
+
+    if (hwnd_cfgui) {
+        SendMessage(hwnd_cfgui, KHUI_WM_CFG_NOTIFY,
+                    MAKEWPARAM(0, WMCFG_SYNC_NODE_LIST), 0);
+    }
+
     LeaveCriticalSection(&cs_cfgui);
 
     /* when the root config list changes, we need to notify the UI.
@@ -254,6 +260,12 @@ khui_cfg_remove(khui_config_node vnode) {
     EnterCriticalSection(&cs_cfgui);
     node = cfgui_node_i_from_handle(vnode);
     node->flags |= KHUI_CN_FLAG_DELETED;
+
+    if (hwnd_cfgui) {
+        SendMessage(hwnd_cfgui, KHUI_WM_CFG_NOTIFY,
+                    MAKEWPARAM(0, WMCFG_SYNC_NODE_LIST), 0);
+    }
+
     LeaveCriticalSection(&cs_cfgui);
 
     return KHM_ERROR_SUCCESS;
diff --git a/src/windows/identity/uilib/creddlg.c b/src/windows/identity/uilib/creddlg.c
index 082f9f257..154ed18eb 100644
--- a/src/windows/identity/uilib/creddlg.c
+++ b/src/windows/identity/uilib/creddlg.c
@@ -322,8 +322,8 @@ cw_create_prompt(khm_size idx,
                  khm_int32 flags)
 {
     khui_new_creds_prompt * p;
-    size_t cb_prompt;
-    size_t cb_def;
+    size_t cb_prompt = 0;
+    size_t cb_def = 0;
 
     if(prompt && FAILED(StringCbLength(prompt, KHUI_MAXCB_PROMPT, &cb_prompt)))
         return NULL;
diff --git a/src/windows/identity/uilib/khconfigui.h b/src/windows/identity/uilib/khconfigui.h
index f124b513f..1d09fae9e 100644
--- a/src/windows/identity/uilib/khconfigui.h
+++ b/src/windows/identity/uilib/khconfigui.h
@@ -77,6 +77,11 @@ enum khui_wm_cfg_notifications {
       'Apply' button or the 'Ok' button.  The panels are responsible
       for applying the configuration changes and updating their flags
       using khui_cfg_set_flags(). */
+
+    WMCFG_SYNC_NODE_LIST = 4,
+    /*!< Sent from the UI library to the configuration window to
+      notify the window that the node list has changed.  This message
+      is sent synchronously before the node is removed. */
 };
 
 /*! \brief Registration information for a configuration node