diff --git a/EAPMethods/EAPTTLS/EAPTTLS.vcxproj b/EAPMethods/EAPTTLS/EAPTTLS.vcxproj
index fc28fc8..987a287 100644
--- a/EAPMethods/EAPTTLS/EAPTTLS.vcxproj
+++ b/EAPMethods/EAPTTLS/EAPTTLS.vcxproj
@@ -97,6 +97,9 @@
     <ProjectReference Include="..\..\lib\EAPBase\build\EAPBase.vcxproj">
       <Project>{ad6816a0-9600-4e01-8c49-39d03d1e791f}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\lib\EAPMsg\build\EAPMsg.vcxproj">
+      <Project>{b385ec2b-c3f4-48bb-9bac-8b996de7f754}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\lib\Events\build\Events.vcxproj">
       <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
     </ProjectReference>
diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj
index b696b13..9fc33de 100644
--- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj
+++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj
@@ -100,6 +100,12 @@
     <ProjectReference Include="..\..\lib\EAPBase_UI\build\EAPBase_UI.vcxproj">
       <Project>{d4b54856-be1f-4937-a8f7-495125be76be}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\lib\EAPMsg\build\EAPMsg.vcxproj">
+      <Project>{b385ec2b-c3f4-48bb-9bac-8b996de7f754}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\lib\EAPMsg_UI\build\EAPMsg_UI.vcxproj">
+      <Project>{13d2d8b5-f6aa-459d-b5f7-29b95dd9d583}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\lib\Events\build\Events.vcxproj">
       <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
     </ProjectReference>
diff --git a/lib/TTLS_UI/include/TTLS_UI.h b/lib/TTLS_UI/include/TTLS_UI.h
index 0007799..5e283e3 100644
--- a/lib/TTLS_UI/include/TTLS_UI.h
+++ b/lib/TTLS_UI/include/TTLS_UI.h
@@ -40,6 +40,7 @@ class wxTTLSConfigWindow;
 #include "../../TLS_UI/include/TLS_UI.h"
 
 #include "../../TTLS/include/Config.h"
+#include "../../EAPMsg/include/Config.h"
 #include "../../PAP/include/Config.h"
 #include "../../MSCHAPv2/include/Config.h"
 
@@ -145,4 +146,5 @@ protected:
     // Temporary inner method configurations to hold data until applied
     eap::config_method_pap      m_cfg_pap;       ///< PAP configuration
     eap::config_method_mschapv2 m_cfg_mschapv2;  ///< MSCHAPv2 configuration
+    eap::config_method_eapmsg   m_cfg_eapmsg;    ///< Inner EAP configuration
 };
diff --git a/lib/TTLS_UI/src/StdAfx.h b/lib/TTLS_UI/src/StdAfx.h
index bb9941f..b497c2f 100644
--- a/lib/TTLS_UI/src/StdAfx.h
+++ b/lib/TTLS_UI/src/StdAfx.h
@@ -25,6 +25,7 @@
 #include "../include/Module.h"
 #include "../include/TTLS_UI.h"
 
+#include "../../EAPMsg_UI/include/EAPMsg_UI.h"
 #include "../../PAP_UI/include/PAP_UI.h"
 #include "../../MSCHAPv2_UI/include/MSCHAPv2_UI.h"
 
diff --git a/lib/TTLS_UI/src/TTLS_UI.cpp b/lib/TTLS_UI/src/TTLS_UI.cpp
index 27f1eeb..2105730 100644
--- a/lib/TTLS_UI/src/TTLS_UI.cpp
+++ b/lib/TTLS_UI/src/TTLS_UI.cpp
@@ -170,6 +170,7 @@ wxTTLSConfigWindow::wxTTLSConfigWindow(eap::config_provider &prov, eap::config_m
     m_cfg((eap::config_method_ttls&)cfg),
     m_cfg_pap(cfg.m_module, cfg.m_level + 1),
     m_cfg_mschapv2(cfg.m_module, cfg.m_level + 1),
+    m_cfg_eapmsg(cfg.m_module, cfg.m_level + 1),
     wxEAPConfigWindow(prov, cfg, parent)
 {
     wxBoxSizer* sb_content;
@@ -189,6 +190,8 @@ wxTTLSConfigWindow::wxTTLSConfigWindow(eap::config_provider &prov, eap::config_m
     m_inner_type->AddPage(panel_pap, _("PAP"));
     wxMSCHAPv2ConfigPanel *panel_mschapv2 = new wxMSCHAPv2ConfigPanel(m_prov, m_cfg_mschapv2, m_inner_type);
     m_inner_type->AddPage(panel_mschapv2, _("MSCHAPv2"));
+    wxEAPMsgConfigPanel *panel_eapmsg = new wxEAPMsgConfigPanel(m_prov, m_cfg_eapmsg, m_inner_type);
+    m_inner_type->AddPage(panel_eapmsg, _("EAP"));
     sb_content->Add(m_inner_type, 0, wxALL|wxEXPAND, 5);
 
     sb_content->Add(20, 20, 1, wxALL|wxEXPAND, 5);