diff --git a/EAPMethods/locale/EAPMethods.pot b/EAPMethods/locale/EAPMethods.pot
index 178c87a..0a01c2e 100644
--- a/EAPMethods/locale/EAPMethods.pot
+++ b/EAPMethods/locale/EAPMethods.pot
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2016-09-20 11:05+0200\n"
+"POT-Creation-Date: 2016-09-27 20:15+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
@@ -43,236 +43,237 @@ msgstr ""
 msgid "Opens dialog with provider settings"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355
-msgid "Client Credentials"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581
+#, c-format
+msgid "%s User Credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241
-msgid "Manage credentials used to connect."
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240
+msgid "Select the source where your credentials used to connect are stored."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254
-msgid "Use &own credentials:"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
+msgid "Use credentials from Credential &Manager:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255
-msgid "Select this option if you have your unique credentials to connect"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
+msgid "Select this option if you would like to use credentials stored in Windows Credential Manager"
+msgstr ""
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253
+msgid "Your present credentials stored in Windows Credential Manager"
 msgstr ""
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260
-msgid "Your credentials loaded from Windows Credential Manager"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270
 msgid "&Clear Credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261
 msgid ""
 "Click to clear your credentials from Credential Manager.\n"
 "Note: You will be prompted to enter credentials when connecting."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292
 msgid "&Set Credentials..."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293
 msgid "Click here to set or modify your credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292
-msgid "Use &pre-shared credentials:"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
+msgid "Use credentials from &profile configuration:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293
-msgid "Select this options if all clients connect using the same credentials"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277
+msgid "Select this option if you would like to store credentials as a part of  profile configuration"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298
-msgid "Common (pre-shared) credentials"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285
+msgid "Profile configuration credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335
+msgid "User ID and Password"
+msgstr ""
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345
 msgid "Please provide your user ID and password."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355
 msgid "User ID:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360
 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364
 msgid "Password:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
 msgid "Enter your password here"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183
-msgid "&Remember"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398
-msgid "Check if you would like to save username and password"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400
 msgid "Your Organization"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411
 msgid "Describe your organization to customize user prompts.  When organization is introduced, end-users find program messages easier to understand and act."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418
 msgid "Your organization &name:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
 msgid "Your organization name as it will appear on helpdesk contact notifications"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427
 msgid "(Keep it short, please)"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437
 msgid "Helpdesk contact &information:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447
 msgid "¶"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454
 msgid "Your helpdesk website address"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458
 msgid "*"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465
 msgid "Your helpdesk e-mail address"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 msgid ")"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476
 msgid "Your helpdesk phone number"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504
 msgid "Provider Unique Identifier"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515
 msgid "Assign your organization a unique ID to allow sharing the same credential set across different network profiles."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "&Namespace:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:RFC4282:realm"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:uuid"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
 msgid "Provider unique &identifier:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543
 msgid "Your organization ID to assign same credentials from other profiles"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568
 msgid "Configuration Lock"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579
 msgid "Your configuration can be locked to prevent accidental modification by end-users. Users will only be allowed to enter credentials."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586
 msgid "&Lock this configuration and prevent any further modification via user interface."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:98
+#: lib/EAPBase_UI/src/EAP_UI.cpp:97
 #, c-format
 msgid "%s Credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:351
-#: lib/EAPBase_UI/include/EAP_UI.h:361 lib/EAPBase_UI/res/wxEAP_UI.h:119
+#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355
+#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119
 msgid "EAP Credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:166
+#: lib/EAPBase_UI/src/EAP_UI.cpp:165
 #, c-format
 msgid "For additional help and instructions, please contact %s at:"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:167
+#: lib/EAPBase_UI/src/EAP_UI.cpp:166
 msgid "your provider"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:186
+#: lib/EAPBase_UI/src/EAP_UI.cpp:185
 msgid "Open the default web browser"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:197
+#: lib/EAPBase_UI/src/EAP_UI.cpp:196
 msgid "Open your e-mail program"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:208
+#: lib/EAPBase_UI/src/EAP_UI.cpp:207
 msgid "Dial the phone number"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:228
+#: lib/EAPBase_UI/src/EAP_UI.cpp:227
 #, c-format
 msgid "%s has pre-set parts of this configuration. Those parts are locked to prevent accidental modification."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:229
+#: lib/EAPBase_UI/src/EAP_UI.cpp:228
 msgid "Your provider"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:250
+#: lib/EAPBase_UI/src/EAP_UI.cpp:249
 msgid "Previous attempt to connect reported invalid credentials."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:251
+#: lib/EAPBase_UI/src/EAP_UI.cpp:250
 msgid "Previous attempt to connect reported your credentials expired."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:252
+#: lib/EAPBase_UI/src/EAP_UI.cpp:251
 msgid "Previous attempt to connect reported your credentials are being changed."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:253
+#: lib/EAPBase_UI/src/EAP_UI.cpp:252
 msgid "Previous attempt to connect failed."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:254
+#: lib/EAPBase_UI/src/EAP_UI.cpp:253
 msgid "Please, make sure your credentials are correct, or try again later."
 msgstr ""
 
+#: lib/PAP_UI/src/PAP_UI.cpp:33
+msgid "PAP User ID and Password"
+msgstr ""
+
 #: lib/TLS_UI/res/wxTLS_UI.cpp:17
 msgid "Server Trust"
 msgstr ""
@@ -325,50 +326,26 @@ msgstr ""
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:120
-msgid "TLS Client Certificate"
+#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571
+msgid "User Certificate"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:131
-msgid "Please select your client certificate to use for authentication."
+#: lib/TLS_UI/res/wxTLS_UI.cpp:129
+msgid "Please select your &certificate to use for authentication."
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:138
-msgid "Co&nnect without providing a client certificate"
-msgstr ""
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:139
-msgid "Select if your server does not require you to provide a client certificate"
-msgstr ""
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:146
-msgid "Use the following &certificate:"
-msgstr ""
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:147
-msgid "Select if you need to provide a client certificate when connecting"
-msgstr ""
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:154
+#: lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:167
+#: lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:172
+#: lib/TLS_UI/res/wxTLS_UI.cpp:148
 msgid "Your identity (username@domain) to override one from certificate; or blank to use one provided in certificate"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:176
-msgid "(Example: user@contoso.com)"
-msgstr ""
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:184
-msgid "Check if you would like to save certificate selection"
-msgstr ""
-
 #: lib/TLS_UI/src/TLS_UI.cpp:118
 #, c-format
 msgid "Invalid character in host name found: %c"
@@ -378,32 +355,37 @@ msgstr ""
 msgid "Validation conflict"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:511
+#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769
+#: lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<empty>"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:500
 msgid "Add Certificate"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:512
+#: lib/TLS_UI/src/TLS_UI.cpp:501
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:513
+#: lib/TLS_UI/src/TLS_UI.cpp:502
 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:514
+#: lib/TLS_UI/src/TLS_UI.cpp:503
 msgid "PKCS #7 Certificate Files (*.p7b)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:515
+#: lib/TLS_UI/src/TLS_UI.cpp:504
 msgid "All Files (*.*)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:531
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 #, c-format
 msgid "Invalid or unsupported certificate file %s"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:531
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 msgid "Error"
 msgstr ""
 
@@ -444,72 +426,76 @@ msgid "Custom outer identity to use"
 msgstr ""
 
 #: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285
-#: lib/EAPBase_UI/include/EAP_UI.h:688
+#: lib/EAPBase_UI/include/EAP_UI.h:696
 #, c-format
 msgid "Error writing credentials to Credential Manager: %hs (error %u)"
 msgstr ""
 
 #: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287
-#: lib/EAPBase_UI/include/EAP_UI.h:691
+#: lib/EAPBase_UI/include/EAP_UI.h:699
 msgid "Writing credentials failed."
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235
+#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181
 msgid "Inner Authentication"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:114
-msgid "Select inner authentication method from the list"
-msgstr ""
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:116
-msgid "PAP"
-msgstr ""
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:118
-msgid "MSCHAPv2"
-msgstr ""
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262
+#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196
 msgid "Outer Authentication"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:288
+#: lib/TTLS_UI/src/TTLS_UI.cpp:187
+msgid "Select inner authentication method from the list"
+msgstr ""
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:189
+msgid "PAP"
+msgstr ""
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:191
+msgid "MSCHAPv2"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:292
 #, c-format
 msgid "Are you sure you want to permanently remove %ls provider from configuration?"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:288
+#: lib/EAPBase_UI/include/EAP_UI.h:292
 msgid "Warning"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:548
+#: lib/EAPBase_UI/include/EAP_UI.h:552
 msgid "Provider Settings"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:704
+#: lib/EAPBase_UI/include/EAP_UI.h:717
 #, c-format
 msgid "Deleting credentials failed (error %u)."
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:738
+#: lib/EAPBase_UI/include/EAP_UI.h:754
 #, c-format
 msgid "<error %u>"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:742
+#: lib/EAPBase_UI/include/EAP_UI.h:758
 msgid "<error>"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:753 lib/EAPBase_UI/include/EAP_UI.h:762
-msgid "<empty>"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:753 lib/EAPBase_UI/include/EAP_UI.h:762
+#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778
 msgid "<blank ID>"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:962
+#: lib/EAPBase_UI/include/EAP_UI.h:820
+msgid "&Remember"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:821
+msgid "Check if you would like to save credentials"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:964
 msgid "<Your Organization>"
 msgstr ""
 
@@ -517,22 +503,30 @@ msgstr ""
 msgid "EAP Connection Configuration"
 msgstr ""
 
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "EAP Methods"
 msgstr ""
 
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Modules to support individual EAP methods"
 msgstr ""
 
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
 msgid "TTLS"
 msgstr ""
 
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
 msgid "Tunneled Transport Layer Security"
 msgstr ""
diff --git a/lib/EAPBase_UI/include/EAP_UI.h b/lib/EAPBase_UI/include/EAP_UI.h
index a255711..c82745d 100644
--- a/lib/EAPBase_UI/include/EAP_UI.h
+++ b/lib/EAPBase_UI/include/EAP_UI.h
@@ -765,7 +765,7 @@ protected:
     {
         wxString identity(m_cred_storage.get_identity());
         m_storage_identity->SetValue(
-            !identity.empty()  ? identity :
+            !identity.empty() ? identity :
             m_cred_storage.empty() ? _("<empty>") : _("<blank ID>"));
     }
 
@@ -774,7 +774,7 @@ protected:
     {
         wxString identity(m_cred_config.get_identity());
         m_config_identity->SetValue(
-            !identity.empty()  ? identity :
+            !identity.empty() ? identity :
             m_cred_config.empty() ? _("<empty>") : _("<blank ID>"));
     }