diff --git a/EAPMethods/src/Main.cpp b/EAPMethods/src/Main.cpp
index 6f444a1..e070b1f 100644
--- a/EAPMethods/src/Main.cpp
+++ b/EAPMethods/src/Main.cpp
@@ -537,11 +537,11 @@ DWORD APIENTRY EapPeerGetUIContext(
 /// \sa [EapPeerSetUIContext function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363626.aspx)
 ///
 DWORD APIENTRY EapPeerSetUIContext(
-    _In_                                      EAP_SESSION_HANDLE  hSession,
-    _In_                                      DWORD               dwUIContextDataSize,
-    _In_count_(dwUIContextDataSize)   const   BYTE                *pUIContextData,
-    _In_                            /*const*/ EapPeerMethodOutput *pEapOutput,
-    _Out_                                     EAP_ERROR           **ppEapError)
+    _In_                                  EAP_SESSION_HANDLE  hSession,
+    _In_                                  DWORD               dwUIContextDataSize,
+    _In_count_(dwUIContextDataSize) const BYTE                *pUIContextData,
+    _Out_                                 EapPeerMethodOutput *pEapOutput,
+    _Out_                                 EAP_ERROR           **ppEapError)
 {
     DWORD dwResult = ERROR_SUCCESS;
     event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
diff --git a/lib/EAPBase/include/Module.h b/lib/EAPBase/include/Module.h
index 069d1ef..eaf4d47 100644
--- a/lib/EAPBase/include/Module.h
+++ b/lib/EAPBase/include/Module.h
@@ -762,7 +762,7 @@ namespace eap
             _In_                                  EAP_SESSION_HANDLE  hSession,
             _In_count_(dwUIContextDataSize) const BYTE                *pUIContextData,
             _In_                                  DWORD               dwUIContextDataSize,
-            _In_                            const EapPeerMethodOutput *pEapOutput) = 0;
+            _Out_                                 EapPeerMethodOutput *pEapOutput) = 0;
 
         ///
         /// Obtains an array of EAP response attributes from the EAP method.
diff --git a/lib/TTLS/include/Module.h b/lib/TTLS/include/Module.h
index 223c085..edcc02a 100644
--- a/lib/TTLS/include/Module.h
+++ b/lib/TTLS/include/Module.h
@@ -190,7 +190,7 @@ namespace eap
             _In_                                  EAP_SESSION_HANDLE  hSession,
             _In_count_(dwUIContextDataSize) const BYTE                *pUIContextData,
             _In_                                  DWORD               dwUIContextDataSize,
-            _In_                            const EapPeerMethodOutput *pEapOutput);
+            _Out_                                 EapPeerMethodOutput *pEapOutput);
 
         ///
         /// Obtains an array of EAP response attributes from the EAP method.
diff --git a/lib/TTLS/src/Module.cpp b/lib/TTLS/src/Module.cpp
index 856c087..206eab5 100644
--- a/lib/TTLS/src/Module.cpp
+++ b/lib/TTLS/src/Module.cpp
@@ -311,7 +311,7 @@ void eap::peer_ttls::set_ui_context(
     _In_                                  EAP_SESSION_HANDLE  hSession,
     _In_count_(dwUIContextDataSize) const BYTE                *pUIContextData,
     _In_                                  DWORD               dwUIContextDataSize,
-    _In_                            const EapPeerMethodOutput *pEapOutput)
+    _Out_                                 EapPeerMethodOutput *pEapOutput)
 {
     UNREFERENCED_PARAMETER(hSession);
     UNREFERENCED_PARAMETER(pUIContextData);