diff --git a/EAPMethods/EAPTTLS/StdAfx.h b/EAPMethods/EAPTTLS/StdAfx.h
index 25861be..f634574 100644
Binary files a/EAPMethods/EAPTTLS/StdAfx.h and b/EAPMethods/EAPTTLS/StdAfx.h differ
diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.rc b/EAPMethods/EAPTTLSUI/EAPTTLSUI.rc
index cabbcdb..c80b6e1 100644
Binary files a/EAPMethods/EAPTTLSUI/EAPTTLSUI.rc and b/EAPMethods/EAPTTLSUI/EAPTTLSUI.rc differ
diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj
index 0de4b61..1472d67 100644
--- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj
+++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj
@@ -80,6 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
   <ItemGroup>
     <ClInclude Include="..\include\EAP.h" />
+    <ClInclude Include="..\include\EAPXML.h" />
     <ClInclude Include="..\include\EAP_UI.h" />
     <ClInclude Include="..\include\TLS.h" />
     <ClInclude Include="..\include\TTLS.h" />
diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters
index 6a0781e..7da1c1c 100644
--- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters
+++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters
@@ -57,6 +57,9 @@
     <ClInclude Include="..\include\TTLS_UI.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\EAPXML.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="StdAfx.cpp">
diff --git a/EAPMethods/EAPTTLSUI/StdAfx.h b/EAPMethods/EAPTTLSUI/StdAfx.h
index 6c1e78d..57e25be 100644
Binary files a/EAPMethods/EAPTTLSUI/StdAfx.h and b/EAPMethods/EAPTTLSUI/StdAfx.h differ
diff --git a/EAPMethods/include/EAP.h b/EAPMethods/include/EAP.h
index 6b45f08..0b0a580 100644
Binary files a/EAPMethods/include/EAP.h and b/EAPMethods/include/EAP.h differ
diff --git a/EAPMethods/include/EAPXML.h b/EAPMethods/include/EAPXML.h
index 095e875..ee1b682 100644
Binary files a/EAPMethods/include/EAPXML.h and b/EAPMethods/include/EAPXML.h differ
diff --git a/EAPMethods/include/EAP_UI.h b/EAPMethods/include/EAP_UI.h
index f50c541..a98bdf0 100644
Binary files a/EAPMethods/include/EAP_UI.h and b/EAPMethods/include/EAP_UI.h differ
diff --git a/EAPMethods/include/TLS.h b/EAPMethods/include/TLS.h
index 107bf46..c159229 100644
Binary files a/EAPMethods/include/TLS.h and b/EAPMethods/include/TLS.h differ
diff --git a/EAPMethods/include/TLS_UI.h b/EAPMethods/include/TLS_UI.h
index 6f5e0ae..3f87b92 100644
Binary files a/EAPMethods/include/TLS_UI.h and b/EAPMethods/include/TLS_UI.h differ
diff --git a/EAPMethods/include/TTLS_UI.h b/EAPMethods/include/TTLS_UI.h
index 409c102..8430515 100644
Binary files a/EAPMethods/include/TTLS_UI.h and b/EAPMethods/include/TTLS_UI.h differ
diff --git a/EAPMethods/res/wxEAP_UI.cpp b/EAPMethods/res/wxEAP_UI.cpp
index cad4220..1a85449 100644
--- a/EAPMethods/res/wxEAP_UI.cpp
+++ b/EAPMethods/res/wxEAP_UI.cpp
@@ -70,7 +70,7 @@ wxEAPBannerPanelBase::~wxEAPBannerPanelBase()
 {
 }
 
-wxPasswordConfigCredentialsPanelBase::wxPasswordConfigCredentialsPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
+wxPasswordCredentialsPanelBase::wxPasswordCredentialsPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
 	wxStaticBoxSizer* sb_credentials;
 	sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Client Certificate") ), wxVERTICAL );
@@ -112,10 +112,10 @@ wxPasswordConfigCredentialsPanelBase::wxPasswordConfigCredentialsPanelBase( wxWi
 	
 	sb_credentials_vert->Add( sb_credentials_tbl, 0, wxEXPAND|wxALL, 5 );
 	
-	m_prompt = new wxCheckBox( sb_credentials->GetStaticBox(), wxID_ANY, _("&Prompt when connecting"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_prompt->SetHelpText( _("Check if you would like to enter credentials on every connection") );
+	m_remember = new wxCheckBox( sb_credentials->GetStaticBox(), wxID_ANY, _("&Remember credentials"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_remember->SetHelpText( _("Check if you would like to save username and password") );
 	
-	sb_credentials_vert->Add( m_prompt, 0, wxALL|wxEXPAND, 5 );
+	sb_credentials_vert->Add( m_remember, 0, wxALL|wxEXPAND, 5 );
 	
 	
 	sb_credentials_horiz->Add( sb_credentials_vert, 1, wxEXPAND, 5 );
@@ -128,6 +128,6 @@ wxPasswordConfigCredentialsPanelBase::wxPasswordConfigCredentialsPanelBase( wxWi
 	this->Layout();
 }
 
-wxPasswordConfigCredentialsPanelBase::~wxPasswordConfigCredentialsPanelBase()
+wxPasswordCredentialsPanelBase::~wxPasswordCredentialsPanelBase()
 {
 }
diff --git a/EAPMethods/res/wxEAP_UI.fbp b/EAPMethods/res/wxEAP_UI.fbp
index ca57e0d..55ee5bc 100644
--- a/EAPMethods/res/wxEAP_UI.fbp
+++ b/EAPMethods/res/wxEAP_UI.fbp
@@ -446,7 +446,7 @@
             <property name="id">wxID_ANY</property>
             <property name="maximum_size"></property>
             <property name="minimum_size"></property>
-            <property name="name">wxPasswordConfigCredentialsPanelBase</property>
+            <property name="name">wxPasswordCredentialsPanelBase</property>
             <property name="pos"></property>
             <property name="size">500,-1</property>
             <property name="subclass"></property>
@@ -1056,7 +1056,7 @@
                                         <property name="center_pane">0</property>
                                         <property name="checked">0</property>
                                         <property name="close_button">1</property>
-                                        <property name="context_help">Check if you would like to enter credentials on every connection</property>
+                                        <property name="context_help">Check if you would like to save username and password</property>
                                         <property name="context_menu">1</property>
                                         <property name="default_pane">0</property>
                                         <property name="dock">Dock</property>
@@ -1069,7 +1069,7 @@
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">&amp;Prompt when connecting</property>
+                                        <property name="label">&amp;Remember credentials</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
                                         <property name="maximum_size"></property>
@@ -1077,7 +1077,7 @@
                                         <property name="minimize_button">0</property>
                                         <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
-                                        <property name="name">m_prompt</property>
+                                        <property name="name">m_remember</property>
                                         <property name="pane_border">1</property>
                                         <property name="pane_position"></property>
                                         <property name="pane_size"></property>
diff --git a/EAPMethods/res/wxEAP_UI.h b/EAPMethods/res/wxEAP_UI.h
index 5d885ed..c30e38a 100644
--- a/EAPMethods/res/wxEAP_UI.h
+++ b/EAPMethods/res/wxEAP_UI.h
@@ -72,9 +72,9 @@ class wxEAPBannerPanelBase : public wxPanel
 };
 
 ///////////////////////////////////////////////////////////////////////////////
-/// Class wxPasswordConfigCredentialsPanelBase
+/// Class wxPasswordCredentialsPanelBase
 ///////////////////////////////////////////////////////////////////////////////
-class wxPasswordConfigCredentialsPanelBase : public wxPanel 
+class wxPasswordCredentialsPanelBase : public wxPanel 
 {
 	private:
 	
@@ -85,12 +85,12 @@ class wxPasswordConfigCredentialsPanelBase : public wxPanel
 		wxTextCtrl* m_identity;
 		wxStaticText* m_password_label;
 		wxTextCtrl* m_password;
-		wxCheckBox* m_prompt;
+		wxCheckBox* m_remember;
 	
 	public:
 		
-		wxPasswordConfigCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); 
-		~wxPasswordConfigCredentialsPanelBase();
+		wxPasswordCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); 
+		~wxPasswordCredentialsPanelBase();
 	
 };
 
diff --git a/EAPMethods/res/wxTLS_UI.cpp b/EAPMethods/res/wxTLS_UI.cpp
index c9f7ca7..d0d6f52 100644
--- a/EAPMethods/res/wxTLS_UI.cpp
+++ b/EAPMethods/res/wxTLS_UI.cpp
@@ -114,7 +114,7 @@ wxEAPTLSConfigPanelBase::~wxEAPTLSConfigPanelBase()
 	
 }
 
-wxTLSConfigCredentialsPanelBase::wxTLSConfigCredentialsPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
+wxTLSCredentialsPanelBase::wxTLSCredentialsPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
 	wxStaticBoxSizer* sb_credentials;
 	sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Client Credentials") ), wxVERTICAL );
@@ -161,10 +161,10 @@ wxTLSConfigCredentialsPanelBase::wxTLSConfigCredentialsPanelBase( wxWindow* pare
 	
 	sb_credentials_vert->Add( sb_cert_radio, 0, wxEXPAND|wxALL, 5 );
 	
-	m_prompt = new wxCheckBox( sb_credentials->GetStaticBox(), wxID_ANY, _("&Prompt when connecting"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_prompt->SetHelpText( _("Check if you would like to select certificate on every connection") );
+	m_remember = new wxCheckBox( sb_credentials->GetStaticBox(), wxID_ANY, _("&Remember credentials"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_remember->SetHelpText( _("Check if you would like to save certificate selection") );
 	
-	sb_credentials_vert->Add( m_prompt, 0, wxALL|wxEXPAND, 5 );
+	sb_credentials_vert->Add( m_remember, 0, wxALL|wxEXPAND, 5 );
 	
 	
 	sb_credentials_horiz->Add( sb_credentials_vert, 1, wxEXPAND, 5 );
@@ -177,14 +177,14 @@ wxTLSConfigCredentialsPanelBase::wxTLSConfigCredentialsPanelBase( wxWindow* pare
 	this->Layout();
 	
 	// Connect Events
-	m_cert_select->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( wxTLSConfigCredentialsPanelBase::OnCertSelect ), NULL, this );
-	m_prompt->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( wxTLSConfigCredentialsPanelBase::OnPrompt ), NULL, this );
+	m_cert_select->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( wxTLSCredentialsPanelBase::OnCertSelect ), NULL, this );
+	m_remember->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( wxTLSCredentialsPanelBase::OnRemember ), NULL, this );
 }
 
-wxTLSConfigCredentialsPanelBase::~wxTLSConfigCredentialsPanelBase()
+wxTLSCredentialsPanelBase::~wxTLSCredentialsPanelBase()
 {
 	// Disconnect Events
-	m_cert_select->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( wxTLSConfigCredentialsPanelBase::OnCertSelect ), NULL, this );
-	m_prompt->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( wxTLSConfigCredentialsPanelBase::OnPrompt ), NULL, this );
+	m_cert_select->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( wxTLSCredentialsPanelBase::OnCertSelect ), NULL, this );
+	m_remember->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( wxTLSCredentialsPanelBase::OnRemember ), NULL, this );
 	
 }
diff --git a/EAPMethods/res/wxTLS_UI.fbp b/EAPMethods/res/wxTLS_UI.fbp
index fb7dc35..63f48c7 100644
--- a/EAPMethods/res/wxTLS_UI.fbp
+++ b/EAPMethods/res/wxTLS_UI.fbp
@@ -1013,7 +1013,7 @@
             <property name="id">wxID_ANY</property>
             <property name="maximum_size"></property>
             <property name="minimum_size"></property>
-            <property name="name">wxTLSConfigCredentialsPanelBase</property>
+            <property name="name">wxTLSCredentialsPanelBase</property>
             <property name="pos"></property>
             <property name="size">500,-1</property>
             <property name="subclass"></property>
@@ -1547,7 +1547,7 @@
                                         <property name="center_pane">0</property>
                                         <property name="checked">0</property>
                                         <property name="close_button">1</property>
-                                        <property name="context_help">Check if you would like to select certificate on every connection</property>
+                                        <property name="context_help">Check if you would like to save certificate selection</property>
                                         <property name="context_menu">1</property>
                                         <property name="default_pane">0</property>
                                         <property name="dock">Dock</property>
@@ -1560,7 +1560,7 @@
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">&amp;Prompt when connecting</property>
+                                        <property name="label">&amp;Remember credentials</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
                                         <property name="maximum_size"></property>
@@ -1568,7 +1568,7 @@
                                         <property name="minimize_button">0</property>
                                         <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
-                                        <property name="name">m_prompt</property>
+                                        <property name="name">m_remember</property>
                                         <property name="pane_border">1</property>
                                         <property name="pane_position"></property>
                                         <property name="pane_size"></property>
@@ -1590,7 +1590,7 @@
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
                                         <event name="OnChar"></event>
-                                        <event name="OnCheckBox">OnPrompt</event>
+                                        <event name="OnCheckBox">OnRemember</event>
                                         <event name="OnEnterWindow"></event>
                                         <event name="OnEraseBackground"></event>
                                         <event name="OnKeyDown"></event>
diff --git a/EAPMethods/res/wxTLS_UI.h b/EAPMethods/res/wxTLS_UI.h
index e46c8d5..f2ac731 100644
--- a/EAPMethods/res/wxTLS_UI.h
+++ b/EAPMethods/res/wxTLS_UI.h
@@ -68,9 +68,9 @@ class wxEAPTLSConfigPanelBase : public wxPanel
 };
 
 ///////////////////////////////////////////////////////////////////////////////
-/// Class wxTLSConfigCredentialsPanelBase
+/// Class wxTLSCredentialsPanelBase
 ///////////////////////////////////////////////////////////////////////////////
-class wxTLSConfigCredentialsPanelBase : public wxPanel 
+class wxTLSCredentialsPanelBase : public wxPanel 
 {
 	private:
 	
@@ -80,17 +80,17 @@ class wxTLSConfigCredentialsPanelBase : public wxPanel
 		wxRadioButton* m_cert_none;
 		wxRadioButton* m_cert_select;
 		wxChoice* m_cert_select_val;
-		wxCheckBox* m_prompt;
+		wxCheckBox* m_remember;
 		
 		// Virtual event handlers, overide them in your derived class
 		virtual void OnCertSelect( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnPrompt( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnRemember( wxCommandEvent& event ) { event.Skip(); }
 		
 	
 	public:
 		
-		wxTLSConfigCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); 
-		~wxTLSConfigCredentialsPanelBase();
+		wxTLSCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); 
+		~wxTLSCredentialsPanelBase();
 	
 };
 
diff --git a/EAPMethods/src/EAP.cpp b/EAPMethods/src/EAP.cpp
index 132b229..65fe302 100644
Binary files a/EAPMethods/src/EAP.cpp and b/EAPMethods/src/EAP.cpp differ
diff --git a/EAPMethods/src/EAP_UI.cpp b/EAPMethods/src/EAP_UI.cpp
index 67c0080..d75b352 100644
Binary files a/EAPMethods/src/EAP_UI.cpp and b/EAPMethods/src/EAP_UI.cpp differ
diff --git a/EAPMethods/src/Main.cpp b/EAPMethods/src/Main.cpp
index 0680f5f..1f1ee82 100644
Binary files a/EAPMethods/src/Main.cpp and b/EAPMethods/src/Main.cpp differ
diff --git a/EAPMethods/src/Main_UI.cpp b/EAPMethods/src/Main_UI.cpp
index 537221e..a97cbad 100644
Binary files a/EAPMethods/src/Main_UI.cpp and b/EAPMethods/src/Main_UI.cpp differ
diff --git a/EAPMethods/src/TLS.cpp b/EAPMethods/src/TLS.cpp
index cdb5360..7417ea5 100644
Binary files a/EAPMethods/src/TLS.cpp and b/EAPMethods/src/TLS.cpp differ
diff --git a/EAPMethods/src/TLS_UI.cpp b/EAPMethods/src/TLS_UI.cpp
index adf7fd3..bf724dd 100644
Binary files a/EAPMethods/src/TLS_UI.cpp and b/EAPMethods/src/TLS_UI.cpp differ
diff --git a/EAPMethods/src/TTLS_UI.cpp b/EAPMethods/src/TTLS_UI.cpp
index 392bc39..c85b92f 100644
Binary files a/EAPMethods/src/TTLS_UI.cpp and b/EAPMethods/src/TTLS_UI.cpp differ
diff --git a/lib/WinStd b/lib/WinStd
index 3eca4d9..1920ec5 160000
--- a/lib/WinStd
+++ b/lib/WinStd
@@ -1 +1 @@
-Subproject commit 3eca4d9ef4f1b8c6bcc70d792aa45876ccbb39f7
+Subproject commit 1920ec5d3567b52f6e9cf1f449d56f75d5d1e5db