diff --git a/openvpn-gui-res-de.rc b/openvpn-gui-res-de.rc
index 6f52660..653115a 100644
--- a/openvpn-gui-res-de.rc
+++ b/openvpn-gui-res-de.rc
@@ -106,37 +106,36 @@ BEGIN
 END
 
 /* Proxy Settings Dialog */
-ID_DLG_PROXY DIALOG 6, 18, 249, 124
+ID_DLG_PROXY DIALOG 6, 18, 249, 104
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Proxy"
 FONT 8, "Microsoft Sans Serif"
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 BEGIN
-    GROUPBOX "   ", 201, 6, 42, 235, 52
+    GROUPBOX "   ", 201, 6, 46, 235, 52
     AUTORADIOBUTTON "OpenVPN Konfigurationsdatei verwenden", ID_RB_PROXY_OPENVPN, \
-                    13, 12, 200, 10, WS_GROUP | WS_TABSTOP
+                    13, 16, 200, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Internet Explorer Einstellungen verwenden", \
-                    ID_RB_PROXY_MSIE, 13, 27, 200, 10
-    AUTORADIOBUTTON "Manuelle Konfiguration", ID_RB_PROXY_MANUAL, 13, 42, 85, 10
-    AUTORADIOBUTTON "HTTP Proxy", ID_RB_PROXY_HTTP, 20, 58, 90, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "SOCKS Proxy", ID_RB_PROXY_SOCKS, 120, 58, 90, 10
-    LTEXT "Adresse:", ID_TXT_PROXY_ADDRESS, 20, 73, 32, 10
-    RTEXT "Port:", ID_TXT_PROXY_PORT, 171, 73, 20, 10
-    EDITTEXT ID_EDT_PROXY_ADDRESS, 53, 71, 117, 12, ES_AUTOHSCROLL
-    EDITTEXT ID_EDT_PROXY_PORT, 196, 71, 30, 12, ES_AUTOHSCROLL
-    AUTOCHECKBOX "Beim Verbinden nach Benutzername/Passwort fragen", ID_CB_PROXY_AUTH, 13, 103, 183, 10
+                    ID_RB_PROXY_MSIE, 13, 31, 200, 10
+    AUTORADIOBUTTON "Manuelle Konfiguration", ID_RB_PROXY_MANUAL, 13, 46, 85, 10
+    AUTORADIOBUTTON "HTTP Proxy", ID_RB_PROXY_HTTP, 20, 62, 90, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "SOCKS Proxy", ID_RB_PROXY_SOCKS, 120, 62, 90, 10
+    LTEXT "Adresse:", ID_TXT_PROXY_ADDRESS, 20, 77, 32, 10
+    RTEXT "Port:", ID_TXT_PROXY_PORT, 171, 77, 20, 10
+    EDITTEXT ID_EDT_PROXY_ADDRESS, 53, 75, 117, 12, ES_AUTOHSCROLL
+    EDITTEXT ID_EDT_PROXY_PORT, 196, 75, 30, 12, ES_AUTOHSCROLL
 END
 
 /* General Settings Dialog */
-ID_DLG_GENERAL DIALOGEX 6, 18, 249, 124
+ID_DLG_GENERAL DIALOGEX 6, 18, 249, 104
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Allgemein"
 FONT 8, "Microsoft Sans Serif"
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 BEGIN
-    GROUPBOX "Benutzeroberfläche", 201, 6, 6, 235, 30
-    LTEXT "Sprache:", ID_TXT_LANGUAGE, 17, 19, 29, 12
-    COMBOBOX ID_CMB_LANGUAGE, 51, 17, 177, 400, CBS_DROPDOWNLIST | WS_TABSTOP
+    GROUPBOX "Benutzeroberfläche", 201, 6, 12, 235, 30
+    LTEXT "Sprache:", ID_TXT_LANGUAGE, 17, 25, 29, 12
+    COMBOBOX ID_CMB_LANGUAGE, 51, 23, 177, 400, CBS_DROPDOWNLIST | WS_TABSTOP
 END
 
 /* Proxy Authentication Dialog */
@@ -318,7 +317,6 @@ BEGIN
     IDS_ERR_SOCKS_PROXY_PORT_RANGE "Sie müssen einen SOCKS Proxy Port zwischen 1-65535 definieren"
     IDS_ERR_CREATE_REG_HKCU_KEY "Fehler beim Erstellen des ""HKEY_CURRENT_USER\\%s"" Schlüssels."
     IDS_ERR_GET_TEMP_PATH "Fehler beim Erkennen des TempPath mit GetTempPath(). Benutzen Sie stattdessen ""C:\\"""
-    IDS_ERR_CREATE_AUTH_FILE "Fehler beim Erstellen der AUTH Datei. (%s)"
 
     /* service */
     IDS_ERR_OPEN_SCMGR_ADMIN "OpenSCManager Fehler. Sie benötigen Administratorenrechte um diesen Service zu starten."
diff --git a/openvpn-gui-res-dk.rc b/openvpn-gui-res-dk.rc
index 5b84fcc..3a0f3cb 100644
--- a/openvpn-gui-res-dk.rc
+++ b/openvpn-gui-res-dk.rc
@@ -106,37 +106,36 @@ BEGIN
 END
 
 /* Proxy Settings Dialog */
-ID_DLG_PROXY DIALOG 6, 18, 249, 124
+ID_DLG_PROXY DIALOG 6, 18, 249, 104
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Proxy"
 FONT 8, "Microsoft Sans Serif"
 LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL
 BEGIN
-    GROUPBOX "   ", 201, 6, 42, 235, 52
+    GROUPBOX "   ", 201, 6, 46, 235, 52
     AUTORADIOBUTTON "Brug indstillinger fra OpenVPNs config-fil", ID_RB_PROXY_OPENVPN, \
-                    13, 12, 200, 10, WS_GROUP | WS_TABSTOP
+                    13, 16, 200, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Brug indstillinger fra Internet Explorer", \
-                    ID_RB_PROXY_MSIE, 13, 27, 200, 10
-    AUTORADIOBUTTON "Manuel Konfigurering", ID_RB_PROXY_MANUAL, 13, 42, 81, 10
-    AUTORADIOBUTTON "HTTP Proxy", ID_RB_PROXY_HTTP, 20, 58, 90, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "SOCKS Proxy", ID_RB_PROXY_SOCKS, 120, 58, 90, 10
-    LTEXT "Adresse:", ID_TXT_PROXY_ADDRESS, 20, 73, 32, 10
-    RTEXT "Port:", ID_TXT_PROXY_PORT, 171, 73, 20, 10
-    EDITTEXT ID_EDT_PROXY_ADDRESS, 53, 71, 117, 12, ES_AUTOHSCROLL
-    EDITTEXT ID_EDT_PROXY_PORT, 196, 71, 30, 12, ES_AUTOHSCROLL
-    AUTOCHECKBOX "Bed om brugernavn ved tilslutning.", ID_CB_PROXY_AUTH, 13, 103, 183, 10
+                    ID_RB_PROXY_MSIE, 13, 31, 200, 10
+    AUTORADIOBUTTON "Manuel Konfigurering", ID_RB_PROXY_MANUAL, 13, 46, 81, 10
+    AUTORADIOBUTTON "HTTP Proxy", ID_RB_PROXY_HTTP, 20, 62, 90, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "SOCKS Proxy", ID_RB_PROXY_SOCKS, 120, 62, 90, 10
+    LTEXT "Adresse:", ID_TXT_PROXY_ADDRESS, 20, 77, 32, 10
+    RTEXT "Port:", ID_TXT_PROXY_PORT, 171, 77, 20, 10
+    EDITTEXT ID_EDT_PROXY_ADDRESS, 53, 75, 117, 12, ES_AUTOHSCROLL
+    EDITTEXT ID_EDT_PROXY_PORT, 196, 75, 30, 12, ES_AUTOHSCROLL
 END
 
 /* General Settings Dialog */
-ID_DLG_GENERAL DIALOGEX 6, 18, 249, 124
+ID_DLG_GENERAL DIALOGEX 6, 18, 249, 104
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Generelt"
 FONT 8, "Microsoft Sans Serif"
 LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL
 BEGIN
-    GROUPBOX "Brugergrænseflade", 201, 6, 6, 235, 30
-    LTEXT "Language:", ID_TXT_LANGUAGE, 17, 19, 52, 12
-    COMBOBOX ID_CMB_LANGUAGE, 57, 17, 171, 400, CBS_DROPDOWNLIST | WS_TABSTOP
+    GROUPBOX "Brugergrænseflade", 201, 6, 12, 235, 30
+    LTEXT "Language:", ID_TXT_LANGUAGE, 17, 25, 52, 12
+    COMBOBOX ID_CMB_LANGUAGE, 57, 23, 171, 400, CBS_DROPDOWNLIST | WS_TABSTOP
 END
 
 /* Proxy Authentication Dialog */
@@ -318,7 +317,6 @@ BEGIN
     IDS_ERR_SOCKS_PROXY_PORT_RANGE "SOCKS proxy port skal være et tal mellem 1 og 65535"
     IDS_ERR_CREATE_REG_HKCU_KEY "En fejl opstod ved oprettelse af register-nøgle ""HKEY_CURRENT_USER\\%s"""
     IDS_ERR_GET_TEMP_PATH "En fejl opstod da GetTempPath() skulle bestemmes. Alternativet ""C:\\"" vil blive benyttet."
-    IDS_ERR_CREATE_AUTH_FILE "En fejl opstod under oprettelse af AUTH fil (%s)"
 
     /* service */
     IDS_ERR_OPEN_SCMGR_ADMIN "En fejl opstod under åbning af Service Manager. Du har sandsynligvis ikke rettigheder til at starte/stoppe en service."
diff --git a/openvpn-gui-res-en.rc b/openvpn-gui-res-en.rc
index 978217b..f1fcfdd 100644
--- a/openvpn-gui-res-en.rc
+++ b/openvpn-gui-res-en.rc
@@ -105,37 +105,36 @@ BEGIN
 END
 
 /* Proxy Settings Dialog */
-ID_DLG_PROXY DIALOG 6, 18, 249, 124
+ID_DLG_PROXY DIALOG 6, 18, 249, 104
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Proxy"
 FONT 8, "Microsoft Sans Serif"
 LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 BEGIN
-    GROUPBOX "   ", 201, 6, 42, 235, 52
+    GROUPBOX "   ", 201, 6, 46, 235, 52
     AUTORADIOBUTTON "Use OpenVPN Config-file Settings", ID_RB_PROXY_OPENVPN, \
-                    13, 12, 200, 10, WS_GROUP | WS_TABSTOP
+                    13, 16, 200, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Use Internet Explorer Settings", \
-                    ID_RB_PROXY_MSIE, 13, 27, 200, 10
-    AUTORADIOBUTTON "Manual Configuration", ID_RB_PROXY_MANUAL, 13, 42, 79, 10
-    AUTORADIOBUTTON "HTTP Proxy", ID_RB_PROXY_HTTP, 20, 58, 90, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "SOCKS Proxy", ID_RB_PROXY_SOCKS, 120, 58, 90, 10
-    LTEXT "Address:", ID_TXT_PROXY_ADDRESS, 20, 73, 32, 10
-    RTEXT "Port:", ID_TXT_PROXY_PORT, 171, 73, 20, 10
-    EDITTEXT ID_EDT_PROXY_ADDRESS, 53, 71, 117, 12, ES_AUTOHSCROLL
-    EDITTEXT ID_EDT_PROXY_PORT, 196, 71, 30, 12, ES_AUTOHSCROLL
-    AUTOCHECKBOX "Prompt for username/password when connecting.", ID_CB_PROXY_AUTH, 13, 103, 183, 10
+                    ID_RB_PROXY_MSIE, 13, 31, 200, 10
+    AUTORADIOBUTTON "Manual Configuration", ID_RB_PROXY_MANUAL, 13, 46, 79, 10
+    AUTORADIOBUTTON "HTTP Proxy", ID_RB_PROXY_HTTP, 20, 62, 90, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "SOCKS Proxy", ID_RB_PROXY_SOCKS, 120, 62, 90, 10
+    LTEXT "Address:", ID_TXT_PROXY_ADDRESS, 20, 77, 32, 10
+    RTEXT "Port:", ID_TXT_PROXY_PORT, 171, 77, 20, 10
+    EDITTEXT ID_EDT_PROXY_ADDRESS, 53, 75, 117, 12, ES_AUTOHSCROLL
+    EDITTEXT ID_EDT_PROXY_PORT, 196, 75, 30, 12, ES_AUTOHSCROLL
 END
 
 /* General Settings Dialog */
-ID_DLG_GENERAL DIALOGEX 6, 18, 249, 124
+ID_DLG_GENERAL DIALOGEX 6, 18, 249, 104
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "General"
 FONT 8, "Microsoft Sans Serif"
 LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 BEGIN
-    GROUPBOX "User Interface", 201, 6, 6, 235, 30
-    LTEXT "Language:", ID_TXT_LANGUAGE, 17, 19, 52, 12
-    COMBOBOX ID_CMB_LANGUAGE, 57, 17, 171, 400, CBS_DROPDOWNLIST | WS_TABSTOP
+    GROUPBOX "User Interface", 201, 6, 12, 235, 30
+    LTEXT "Language:", ID_TXT_LANGUAGE, 17, 25, 52, 12
+    COMBOBOX ID_CMB_LANGUAGE, 57, 23, 171, 400, CBS_DROPDOWNLIST | WS_TABSTOP
 END
 
 /* Proxy Authentication Dialog */
@@ -316,7 +315,6 @@ BEGIN
     IDS_ERR_SOCKS_PROXY_PORT_RANGE "You must specify a SOCKS proxy port between 1-65535"
     IDS_ERR_CREATE_REG_HKCU_KEY "Error creating ""HKEY_CURRENT_USER\\%s"" key."
     IDS_ERR_GET_TEMP_PATH "Error determining TempPath with GetTempPath(). Using ""C:\\"" instead."
-    IDS_ERR_CREATE_AUTH_FILE "Error creating AUTH file. (%s)"
 
     /* service */
     IDS_ERR_OPEN_SCMGR_ADMIN "OpenSCManager failed. You need Administrator rights to start a service."
diff --git a/openvpn-gui-res-es.rc b/openvpn-gui-res-es.rc
index 54f34a3..732f74b 100644
--- a/openvpn-gui-res-es.rc
+++ b/openvpn-gui-res-es.rc
@@ -104,25 +104,24 @@ BEGIN
 END
 
 /* Proxy Settings Dialog */
-ID_DLG_PROXY DIALOG 6, 18, 249, 124
+ID_DLG_PROXY DIALOG 6, 18, 249, 104
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Proxy"
 FONT 8, "Microsoft Sans Serif"
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 BEGIN
-    GROUPBOX "   ", 201, 6, 42, 235, 52
+    GROUPBOX "   ", 201, 6, 46, 235, 52
     AUTORADIOBUTTON "Usar opciones del fichero de configuración de OpenVPN", ID_RB_PROXY_OPENVPN, \
-                    13, 12, 200, 10, WS_GROUP | WS_TABSTOP
+                    13, 16, 200, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Usar las opciones del Internet Explorer", \
-                    ID_RB_PROXY_MSIE, 13, 27, 200, 10
-    AUTORADIOBUTTON "Configuración Manual", ID_RB_PROXY_MANUAL, 13, 42, 82, 10
-    AUTORADIOBUTTON "Proxy HTTP", ID_RB_PROXY_HTTP, 20, 58, 90, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "Proxy SOCKS", ID_RB_PROXY_SOCKS, 120, 58, 90, 10
-    LTEXT "Host:", ID_TXT_PROXY_ADDRESS, 20, 73, 21, 10
-    RTEXT "Puerto:", ID_TXT_PROXY_PORT, 161, 73, 30, 10
-    EDITTEXT ID_EDT_PROXY_ADDRESS, 42, 71, 119, 12, ES_AUTOHSCROLL
-    EDITTEXT ID_EDT_PROXY_PORT, 196, 71, 30, 12, ES_AUTOHSCROLL
-    AUTOCHECKBOX "Pedir usuario/clave al conectar.", ID_CB_PROXY_AUTH, 13, 103, 183, 10
+                    ID_RB_PROXY_MSIE, 13, 31, 200, 10
+    AUTORADIOBUTTON "Configuración Manual", ID_RB_PROXY_MANUAL, 13, 46, 82, 10
+    AUTORADIOBUTTON "Proxy HTTP", ID_RB_PROXY_HTTP, 20, 62, 90, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "Proxy SOCKS", ID_RB_PROXY_SOCKS, 120, 62, 90, 10
+    LTEXT "Host:", ID_TXT_PROXY_ADDRESS, 20, 77, 21, 10
+    RTEXT "Puerto:", ID_TXT_PROXY_PORT, 161, 77, 30, 10
+    EDITTEXT ID_EDT_PROXY_ADDRESS, 42, 75, 119, 12, ES_AUTOHSCROLL
+    EDITTEXT ID_EDT_PROXY_PORT, 196, 75, 30, 12, ES_AUTOHSCROLL
 END
 
 /* Proxy Authentication Dialog */
@@ -303,7 +302,6 @@ BEGIN
     IDS_ERR_SOCKS_PROXY_PORT_RANGE "Debe especificarse un puerto entre 1-65535"
     IDS_ERR_CREATE_REG_HKCU_KEY "Error al crear la clave ""HKEY_CURRENT_USER\\%s""."
     IDS_ERR_GET_TEMP_PATH "Error al determinar TempPath con GetTempPath(). Usando ""C:\\"" en su lugar."
-    IDS_ERR_CREATE_AUTH_FILE "Error al crear el fichero de AUTH. (%s)"
 
     /* service */
     IDS_ERR_OPEN_SCMGR_ADMIN "OpenSCManager falló. Se necesitan privilegios de Administrador para iniciar un servicio."
diff --git a/openvpn-gui-res-fi.rc b/openvpn-gui-res-fi.rc
index 6441be7..a245c32 100644
--- a/openvpn-gui-res-fi.rc
+++ b/openvpn-gui-res-fi.rc
@@ -106,37 +106,36 @@ BEGIN
 END
 
 /* Proxy Settings Dialog */
-ID_DLG_PROXY DIALOG 6, 18, 249, 124
+ID_DLG_PROXY DIALOG 6, 18, 249, 104
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Välipalvelin"
 FONT 8, "Microsoft Sans Serif"
 LANGUAGE LANG_FINNISH, SUBLANG_NEUTRAL
 BEGIN
-    GROUPBOX "   ", 201, 6, 42, 235, 52
+    GROUPBOX "   ", 201, 6, 46, 235, 52
     AUTORADIOBUTTON "Käytä asetustiedoston asetuksia", ID_RB_PROXY_OPENVPN, \
-                    13, 12, 200, 10, WS_GROUP | WS_TABSTOP
+                    13, 16, 200, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Käytä Internet Explorerin asetuksia", \
-                    ID_RB_PROXY_MSIE, 13, 27, 200, 10
-    AUTORADIOBUTTON "Määritä asetukset itse", ID_RB_PROXY_MANUAL, 13, 42, 84, 10
-    AUTORADIOBUTTON "HTTP-välipalvelin", ID_RB_PROXY_HTTP, 20, 58, 90, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "SOCKS-välipalvelin", ID_RB_PROXY_SOCKS, 120, 58, 90, 10
-    LTEXT "Osoite:", ID_TXT_PROXY_ADDRESS, 20, 73, 25, 10
-    RTEXT "Portti:", ID_TXT_PROXY_PORT, 171, 73, 20, 10
-    EDITTEXT ID_EDT_PROXY_ADDRESS, 46, 71, 120, 12, ES_AUTOHSCROLL
-    EDITTEXT ID_EDT_PROXY_PORT, 196, 71, 30, 12, ES_AUTOHSCROLL
-    AUTOCHECKBOX "Kysy käyttäjänimi ja salasana yhdistettäessä.", ID_CB_PROXY_AUTH, 13, 103, 183, 10
+                    ID_RB_PROXY_MSIE, 13, 31, 200, 10
+    AUTORADIOBUTTON "Määritä asetukset itse", ID_RB_PROXY_MANUAL, 13, 46, 84, 10
+    AUTORADIOBUTTON "HTTP-välipalvelin", ID_RB_PROXY_HTTP, 20, 62, 90, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "SOCKS-välipalvelin", ID_RB_PROXY_SOCKS, 120, 62, 90, 10
+    LTEXT "Osoite:", ID_TXT_PROXY_ADDRESS, 20, 77, 25, 10
+    RTEXT "Portti:", ID_TXT_PROXY_PORT, 171, 77, 20, 10
+    EDITTEXT ID_EDT_PROXY_ADDRESS, 46, 75, 120, 12, ES_AUTOHSCROLL
+    EDITTEXT ID_EDT_PROXY_PORT, 196, 75, 30, 12, ES_AUTOHSCROLL
 END
 
 /* General Settings Dialog */
-ID_DLG_GENERAL DIALOGEX 6, 18, 249, 124
+ID_DLG_GENERAL DIALOGEX 6, 18, 249, 104
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Yleiset asetukset"
 FONT 8, "Microsoft Sans Serif"
 LANGUAGE LANG_FINNISH, SUBLANG_NEUTRAL
 BEGIN
-    GROUPBOX "Käyttöliittymä", 201, 6, 6, 235, 30
-    LTEXT "Kieli:", ID_TXT_LANGUAGE, 17, 19, 36, 12
-    COMBOBOX ID_CMB_LANGUAGE, 37, 17, 191, 400, CBS_DROPDOWNLIST | WS_TABSTOP
+    GROUPBOX "Käyttöliittymä", 201, 6, 12, 235, 30
+    LTEXT "Kieli:", ID_TXT_LANGUAGE, 17, 25, 36, 12
+    COMBOBOX ID_CMB_LANGUAGE, 37, 23, 191, 400, CBS_DROPDOWNLIST | WS_TABSTOP
 END
 
 /* Proxy Authentication Dialog */
@@ -318,7 +317,6 @@ BEGIN
     IDS_ERR_SOCKS_PROXY_PORT_RANGE "SOCKS-välipalvelimen portti on oltava väliltä 1-65535"
     IDS_ERR_CREATE_REG_HKCU_KEY "Virhe luotaessa avainta ""HKEY_CURRENT_USER\\%s""."
     IDS_ERR_GET_TEMP_PATH "Virhe määritettäessä muuttujaa TempPath funktiolla GetTempPath(). Käytetään polkua ""C:\\""."
-    IDS_ERR_CREATE_AUTH_FILE "AUTH-tiedoston luonti epäonnistui. (%s)"
 
     /* service */
     IDS_ERR_OPEN_SCMGR_ADMIN "OpenSCManager kohtasi virheen. Palveluna käynnistäminen vaatii ylläpitäjän oikeudet."
diff --git a/openvpn-gui-res-fr.rc b/openvpn-gui-res-fr.rc
index 28d3594..87d2b1a 100644
--- a/openvpn-gui-res-fr.rc
+++ b/openvpn-gui-res-fr.rc
@@ -103,25 +103,36 @@ BEGIN
 END
 
 /* Proxy Settings Dialog */
-ID_DLG_PROXY DIALOG 6, 18, 249, 124
+ID_DLG_PROXY DIALOG 6, 18, 249, 104
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Proxy"
 FONT 8, "Microsoft Sans Serif"
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 BEGIN
-    GROUPBOX "   ", 201, 6, 42, 235, 52
+    GROUPBOX "   ", 201, 6, 46, 235, 52
     AUTORADIOBUTTON "Utiliser le fichier de la configuration OpenVPN", ID_RB_PROXY_OPENVPN, \
-                    13, 12, 200, 10, WS_GROUP | WS_TABSTOP
+                    13, 16, 200, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Utiliser la configuration d'Internet Explorer", \
-                    ID_RB_PROXY_MSIE, 13, 27, 200, 10
-    AUTORADIOBUTTON "Configuration manuelle", ID_RB_PROXY_MANUAL, 13, 42, 84, 10
-    AUTORADIOBUTTON "Proxy HTTP", ID_RB_PROXY_HTTP, 20, 58, 90, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "Proxy SOCKS", ID_RB_PROXY_SOCKS, 120, 58, 90, 10
-    LTEXT "Addresse:", ID_TXT_PROXY_ADDRESS, 20, 73, 36, 10
-    RTEXT "Port:", ID_TXT_PROXY_PORT, 171, 73, 20, 10
-    EDITTEXT ID_EDT_PROXY_ADDRESS, 57, 71, 113, 12, ES_AUTOHSCROLL
-    EDITTEXT ID_EDT_PROXY_PORT, 196, 71, 30, 12, ES_AUTOHSCROLL
-    AUTOCHECKBOX "Demander le nom d'utilisateur/Mot de passe à la connexion", ID_CB_PROXY_AUTH, 13, 103, 225, 10
+                    ID_RB_PROXY_MSIE, 13, 31, 200, 10
+    AUTORADIOBUTTON "Configuration manuelle", ID_RB_PROXY_MANUAL, 13, 46, 84, 10
+    AUTORADIOBUTTON "Proxy HTTP", ID_RB_PROXY_HTTP, 20, 62, 90, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "Proxy SOCKS", ID_RB_PROXY_SOCKS, 120, 62, 90, 10
+    LTEXT "Addresse:", ID_TXT_PROXY_ADDRESS, 20, 77, 36, 10
+    RTEXT "Port:", ID_TXT_PROXY_PORT, 171, 77, 20, 10
+    EDITTEXT ID_EDT_PROXY_ADDRESS, 57, 75, 113, 12, ES_AUTOHSCROLL
+    EDITTEXT ID_EDT_PROXY_PORT, 196, 75, 30, 12, ES_AUTOHSCROLL
+END
+
+/* General Settings Dialog */
+ID_DLG_GENERAL DIALOGEX 6, 18, 249, 104
+STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
+CAPTION "Général"
+FONT 8, "Microsoft Sans Serif"
+LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+BEGIN
+    GROUPBOX "L'interface utilisateur", 201, 6, 12, 235, 30
+    LTEXT "Langue:", ID_TXT_LANGUAGE, 17, 25, 52, 12
+    COMBOBOX ID_CMB_LANGUAGE, 57, 23, 171, 400, CBS_DROPDOWNLIST | WS_TABSTOP
 END
 
 /* Proxy Authentication Dialog */
@@ -138,18 +149,6 @@ BEGIN
     PUSHBUTTON "OK", IDOK, 58, 43, 40, 14
 END
 
-/* General Settings Dialog */
-ID_DLG_GENERAL DIALOGEX 6, 18, 249, 124
-STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
-CAPTION "Général"
-FONT 8, "Microsoft Sans Serif"
-LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
-BEGIN
-    GROUPBOX "L'interface utilisateur", 201, 6, 6, 235, 30
-    LTEXT "Langue:", ID_TXT_LANGUAGE, 17, 19, 52, 12
-    COMBOBOX ID_CMB_LANGUAGE, 57, 17, 171, 400, CBS_DROPDOWNLIST | WS_TABSTOP
-END
-
 STRINGTABLE
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 BEGIN
@@ -314,7 +313,6 @@ BEGIN
     IDS_ERR_SOCKS_PROXY_PORT_RANGE "Vous devez spécifier un port SOCKS entre 1-65535"
     IDS_ERR_CREATE_REG_HKCU_KEY "Erreur de création de la clé ""HKEY_CURRENT_USER\\%s""."
     IDS_ERR_GET_TEMP_PATH "Erreur de détermination TempPath avec GetTempPath(). Utiliser ""C:\\"" à la place."
-    IDS_ERR_CREATE_AUTH_FILE "Erreur de création du fichier AUTH. (%s)"
 
     /* service */
     IDS_ERR_OPEN_SCMGR_ADMIN "OpenSCManager échoué. Vous devez avoir les droits Administrateur pour démarrer un Service."
diff --git a/openvpn-gui-res-it.rc b/openvpn-gui-res-it.rc
index 810342f..dbc31d7 100644
--- a/openvpn-gui-res-it.rc
+++ b/openvpn-gui-res-it.rc
@@ -103,25 +103,24 @@ BEGIN
 END
 
 /* Proxy Settings Dialog */
-ID_DLG_PROXY DIALOG 6, 18, 249, 124
+ID_DLG_PROXY DIALOG 6, 18, 249, 104
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Proxy"
 FONT 8, "Microsoft Sans Serif"
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 BEGIN
-    GROUPBOX "   ", 201, 6, 42, 235, 52
+    GROUPBOX "   ", 201, 6, 46, 235, 52
     AUTORADIOBUTTON "Utilizza il file di configurazione di OpenVPN", ID_RB_PROXY_OPENVPN, \
-                    13, 12, 200, 10, WS_GROUP | WS_TABSTOP
+                    13, 16, 200, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Usa la configurazione di Internet Explorer", \
-                    ID_RB_PROXY_MSIE, 13, 27, 200, 10
-    AUTORADIOBUTTON "Configurazione manuale", ID_RB_PROXY_MANUAL, 13, 42, 88, 10
-    AUTORADIOBUTTON "HTTP Proxy", ID_RB_PROXY_HTTP, 20, 58, 90, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "SOCKS Proxy", ID_RB_PROXY_SOCKS, 120, 58, 90, 10
-    LTEXT "Indirizzo:", ID_TXT_PROXY_ADDRESS, 20, 73, 32, 10
-    RTEXT "Porta:", ID_TXT_PROXY_PORT, 167, 73, 24, 10
-    EDITTEXT ID_EDT_PROXY_ADDRESS, 53, 71, 113, 12, ES_AUTOHSCROLL
-    EDITTEXT ID_EDT_PROXY_PORT, 196, 71, 30, 12, ES_AUTOHSCROLL
-    AUTOCHECKBOX "Richiesta di Nome utente/Password per la connessione.", ID_CB_PROXY_AUTH, 13, 103, 195, 10
+                    ID_RB_PROXY_MSIE, 13, 31, 200, 10
+    AUTORADIOBUTTON "Configurazione manuale", ID_RB_PROXY_MANUAL, 13, 46, 88, 10
+    AUTORADIOBUTTON "HTTP Proxy", ID_RB_PROXY_HTTP, 20, 62, 90, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "SOCKS Proxy", ID_RB_PROXY_SOCKS, 120, 62, 90, 10
+    LTEXT "Indirizzo:", ID_TXT_PROXY_ADDRESS, 20, 77, 32, 10
+    RTEXT "Porta:", ID_TXT_PROXY_PORT, 167, 77, 24, 10
+    EDITTEXT ID_EDT_PROXY_ADDRESS, 53, 75, 113, 12, ES_AUTOHSCROLL
+    EDITTEXT ID_EDT_PROXY_PORT, 196, 75, 30, 12, ES_AUTOHSCROLL
 END
 
 /* Proxy Authentication Dialog */
@@ -302,7 +301,6 @@ BEGIN
     IDS_ERR_SOCKS_PROXY_PORT_RANGE "Devi specificare una porta tra 1-65535 per il SOCKS proxy"
     IDS_ERR_CREATE_REG_HKCU_KEY "Errore nella creazione della chiave ""HKEY_CURRENT_USER\\%s""."
     IDS_ERR_GET_TEMP_PATH "Errore nel determinare TempPath con GetTempPath(). Usa ""C:\\"" invece."
-    IDS_ERR_CREATE_AUTH_FILE "Errore nella creazione del file di AUTH. (%s)"
 
     /* service */
     IDS_ERR_OPEN_SCMGR_ADMIN "OpenSCManager fallito. Devi avere i diritti di amministratore per far partire il servizio."
diff --git a/openvpn-gui-res-nl.rc b/openvpn-gui-res-nl.rc
index 0730849..8021e0d 100644
--- a/openvpn-gui-res-nl.rc
+++ b/openvpn-gui-res-nl.rc
@@ -103,25 +103,24 @@ BEGIN
 END
 
 /* Proxy Settings Dialog */
-ID_DLG_PROXY DIALOG 6, 18, 249, 124
+ID_DLG_PROXY DIALOG 6, 18, 249, 104
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Proxy"
 FONT 8, "Microsoft Sans Serif"
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 BEGIN
-    GROUPBOX "   ", 201, 6, 42, 235, 52
+    GROUPBOX "   ", 201, 6, 46, 235, 52
     AUTORADIOBUTTON "Gebruik OpenVPN instellingen", ID_RB_PROXY_OPENVPN, \
-                    13, 12, 200, 10, WS_GROUP | WS_TABSTOP
+                    13, 16, 200, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Gebruik Internet Explorer Instellingen", \
-                    ID_RB_PROXY_MSIE, 13, 27, 200, 10
-    AUTORADIOBUTTON "Handmatige Configuratie", ID_RB_PROXY_MANUAL, 13, 42, 90, 10
-    AUTORADIOBUTTON "HTTP Proxy", ID_RB_PROXY_HTTP, 20, 58, 90, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "SOCKS Proxy", ID_RB_PROXY_SOCKS, 120, 58, 90, 10
-    LTEXT "Adres:", ID_TXT_PROXY_ADDRESS, 20, 73, 24, 10
-    RTEXT "Poort:", ID_TXT_PROXY_PORT, 167, 73, 24, 10
-    EDITTEXT ID_EDT_PROXY_ADDRESS, 45, 71, 121, 12, ES_AUTOHSCROLL
-    EDITTEXT ID_EDT_PROXY_PORT, 196, 71, 30, 12, ES_AUTOHSCROLL
-    AUTOCHECKBOX "Vraag gebruikersnaam/wachtwoord tijdens verbinden.", ID_CB_PROXY_AUTH, 13, 103, 183, 10
+                    ID_RB_PROXY_MSIE, 13, 31, 200, 10
+    AUTORADIOBUTTON "Handmatige Configuratie", ID_RB_PROXY_MANUAL, 13, 46, 90, 10
+    AUTORADIOBUTTON "HTTP Proxy", ID_RB_PROXY_HTTP, 20, 62, 90, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "SOCKS Proxy", ID_RB_PROXY_SOCKS, 120, 62, 90, 10
+    LTEXT "Adres:", ID_TXT_PROXY_ADDRESS, 20, 77, 24, 10
+    RTEXT "Poort:", ID_TXT_PROXY_PORT, 167, 77, 24, 10
+    EDITTEXT ID_EDT_PROXY_ADDRESS, 45, 75, 121, 12, ES_AUTOHSCROLL
+    EDITTEXT ID_EDT_PROXY_PORT, 196, 75, 30, 12, ES_AUTOHSCROLL
 END
 
 /* Proxy Authentication Dialog */
@@ -303,7 +302,6 @@ BEGIN
     IDS_ERR_SOCKS_PROXY_PORT_RANGE "Er moet een SOCKS proxy poort opgegeven worden tussen 1 en 65535."
     IDS_ERR_CREATE_REG_HKCU_KEY "Fout tijdens aanmaken ""HKEY_CURRENT_USER\\%s"" sleutel."
     IDS_ERR_GET_TEMP_PATH "Fout tijdens opvragen TempPath met GetTempPath(). Gebruikt ""C:\\"" als TempPath."
-    IDS_ERR_CREATE_AUTH_FILE "Fout bij aanmaken AUTH bestand. (%s)"
 
     /* service */
     IDS_ERR_OPEN_SCMGR_ADMIN "Starten van OpenSCManager mislukt. Administrator rechten zijn vereist om een service te starten."
diff --git a/openvpn-gui-res-no.rc b/openvpn-gui-res-no.rc
index eaa3e7e..a0aa82f 100644
--- a/openvpn-gui-res-no.rc
+++ b/openvpn-gui-res-no.rc
@@ -105,25 +105,24 @@ BEGIN
 END
 
 /* Proxy Settings Dialog */
-ID_DLG_PROXY DIALOG 6, 18, 249, 124
+ID_DLG_PROXY DIALOG 6, 18, 249, 104
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Proxy"
 FONT 8, "Microsoft Sans Serif"
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
 BEGIN
-    GROUPBOX "   ", 201, 6, 42, 235, 52
+    GROUPBOX "   ", 201, 6, 46, 235, 52
     AUTORADIOBUTTON "Bruk innstillinger fra OpenVPNs konfig-fil", ID_RB_PROXY_OPENVPN, \
-                    13, 12, 200, 10, WS_GROUP | WS_TABSTOP
+                    13, 16, 200, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Bruk innstillinger fra Internet Explorer", \
-                    ID_RB_PROXY_MSIE, 13, 27, 200, 10
-    AUTORADIOBUTTON "Manuell Konfigurering", ID_RB_PROXY_MANUAL, 13, 42, 81, 10
-    AUTORADIOBUTTON "HTTP Proxy", ID_RB_PROXY_HTTP, 20, 58, 90, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "SOCKS Proxy", ID_RB_PROXY_SOCKS, 120, 58, 90, 10
-    LTEXT "Adresse:", ID_TXT_PROXY_ADDRESS, 20, 73, 32, 10
-    RTEXT "Port:", ID_TXT_PROXY_PORT, 171, 73, 20, 10
-    EDITTEXT ID_EDT_PROXY_ADDRESS, 53, 71, 117, 12, ES_AUTOHSCROLL
-    EDITTEXT ID_EDT_PROXY_PORT, 196, 71, 30, 12, ES_AUTOHSCROLL
-    AUTOCHECKBOX "Be om brukernavn ved tilkobling.", ID_CB_PROXY_AUTH, 13, 103, 183, 10
+                    ID_RB_PROXY_MSIE, 13, 31, 200, 10
+    AUTORADIOBUTTON "Manuell Konfigurering", ID_RB_PROXY_MANUAL, 13, 46, 81, 10
+    AUTORADIOBUTTON "HTTP Proxy", ID_RB_PROXY_HTTP, 20, 62, 90, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "SOCKS Proxy", ID_RB_PROXY_SOCKS, 120, 62, 90, 10
+    LTEXT "Adresse:", ID_TXT_PROXY_ADDRESS, 20, 77, 32, 10
+    RTEXT "Port:", ID_TXT_PROXY_PORT, 171, 77, 20, 10
+    EDITTEXT ID_EDT_PROXY_ADDRESS, 53, 75, 117, 12, ES_AUTOHSCROLL
+    EDITTEXT ID_EDT_PROXY_PORT, 196, 75, 30, 12, ES_AUTOHSCROLL
 END
 
 /* Proxy Authentication Dialog */
@@ -303,7 +302,6 @@ BEGIN
     IDS_ERR_SOCKS_PROXY_PORT_RANGE "SOCKS proxy port må være ett tall mellom 1 og 65535"
     IDS_ERR_CREATE_REG_HKCU_KEY "En feil oppsto ved opprettelse av register-nøkkel ""HKEY_CURRENT_USER\\%s"""
     IDS_ERR_GET_TEMP_PATH "En feil oppsto når GetTempPath() ble kalt opp. Alternativ ""C:\\"" vil bi benyttet."
-    IDS_ERR_CREATE_AUTH_FILE "En feil oppsto under opprettelse av AUTH fil (%s)"
 
     /* service */
     IDS_ERR_OPEN_SCMGR_ADMIN "En feil oppsto under åpning av Service Manager. Du har sannsynligvis ikke rettigheter til å starte/stoppe en service."
diff --git a/openvpn-gui-res-pl.rc b/openvpn-gui-res-pl.rc
index 19b47ec..a03aebc 100755
--- a/openvpn-gui-res-pl.rc
+++ b/openvpn-gui-res-pl.rc
@@ -106,37 +106,36 @@ BEGIN
 END
 
 /* Proxy Settings Dialog */
-ID_DLG_PROXY DIALOG 6, 18, 249, 124
+ID_DLG_PROXY DIALOG 6, 18, 249, 104
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Proxy"
 FONT 8, "Microsoft Sans Serif"
 LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL
 BEGIN
-    GROUPBOX "   ", 201, 6, 42, 235, 52
+    GROUPBOX "   ", 201, 6, 46, 235, 52
     AUTORADIOBUTTON "U¿yj ustawieñ z pliku konfiguracyjnego OpenVPN-a", ID_RB_PROXY_OPENVPN, \
-                    13, 12, 200, 10, WS_GROUP | WS_TABSTOP
+                    13, 16, 200, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "U¿yj ustawieñ programu Internet Explorer", \
-                    ID_RB_PROXY_MSIE, 13, 27, 200, 10
-    AUTORADIOBUTTON "Konfiguracja Rêczna", ID_RB_PROXY_MANUAL, 13, 42, 79, 10
-    AUTORADIOBUTTON "HTTP Proxy", ID_RB_PROXY_HTTP, 20, 58, 90, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "SOCKS Proxy", ID_RB_PROXY_SOCKS, 120, 58, 90, 10
-    LTEXT "Adres:", ID_TXT_PROXY_ADDRESS, 20, 73, 32, 10
-    RTEXT "Port:", ID_TXT_PROXY_PORT, 171, 73, 20, 10
-    EDITTEXT ID_EDT_PROXY_ADDRESS, 53, 71, 117, 12, ES_AUTOHSCROLL
-    EDITTEXT ID_EDT_PROXY_PORT, 196, 71, 30, 12, ES_AUTOHSCROLL
-    AUTOCHECKBOX "Monituj o u¿ytkownika/has³o podczas ³¹czenia.", ID_CB_PROXY_AUTH, 13, 103, 183, 10
+                    ID_RB_PROXY_MSIE, 13, 31, 200, 10
+    AUTORADIOBUTTON "Konfiguracja Rêczna", ID_RB_PROXY_MANUAL, 13, 46, 79, 10
+    AUTORADIOBUTTON "HTTP Proxy", ID_RB_PROXY_HTTP, 20, 62, 90, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "SOCKS Proxy", ID_RB_PROXY_SOCKS, 120, 62, 90, 10
+    LTEXT "Adres:", ID_TXT_PROXY_ADDRESS, 20, 77, 32, 10
+    RTEXT "Port:", ID_TXT_PROXY_PORT, 171, 77, 20, 10
+    EDITTEXT ID_EDT_PROXY_ADDRESS, 53, 75, 117, 12, ES_AUTOHSCROLL
+    EDITTEXT ID_EDT_PROXY_PORT, 196, 75, 30, 12, ES_AUTOHSCROLL
 END
 
 /* General Settings Dialog */
-ID_DLG_GENERAL DIALOGEX 6, 18, 249, 124
+ID_DLG_GENERAL DIALOGEX 6, 18, 249, 104
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Ogólne"
 FONT 8, "Microsoft Sans Serif"
 LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL
 BEGIN
-    GROUPBOX "Interfejs U¿ytkownika", 201, 6, 6, 235, 30
-    LTEXT "Jêzyk:", ID_TXT_LANGUAGE, 17, 19, 52, 12
-    COMBOBOX ID_CMB_LANGUAGE, 57, 17, 171, 400, CBS_DROPDOWNLIST | WS_TABSTOP
+    GROUPBOX "Interfejs U¿ytkownika", 201, 6, 12, 235, 30
+    LTEXT "Jêzyk:", ID_TXT_LANGUAGE, 17, 25, 52, 12
+    COMBOBOX ID_CMB_LANGUAGE, 57, 23, 171, 400, CBS_DROPDOWNLIST | WS_TABSTOP
 END
 
 /* Proxy Authentication Dialog */
@@ -317,7 +316,6 @@ BEGIN
     IDS_ERR_SOCKS_PROXY_PORT_RANGE "Port dla us³ugi proxy protoko³u SOCKS musi zawieraæ siê w przedziale 1-65535"
     IDS_ERR_CREATE_REG_HKCU_KEY "B³¹d podczas tworzenia klucza rejestru ""HKEY_CURRENT_USER\\%s""."
     IDS_ERR_GET_TEMP_PATH "B³¹d przy ustalaniu katalogu tymczasowego przy pomocy funkcji GetTempPath(). U¿yty zostanie katalog ""C:\\""."
-    IDS_ERR_CREATE_AUTH_FILE "B³¹d podczas tworzenia pliku AUTH. (%s)"
 
     /* service */
     IDS_ERR_OPEN_SCMGR_ADMIN "B³¹d OpenSCManager'a. Do uruchomienia us³ugi wymagane s¹ uprawnienia administratora."
diff --git a/openvpn-gui-res-pt.rc b/openvpn-gui-res-pt.rc
index e64fe5f..b32e43d 100644
--- a/openvpn-gui-res-pt.rc
+++ b/openvpn-gui-res-pt.rc
@@ -104,25 +104,24 @@ BEGIN
 END
 
 /* Proxy Settings Dialog */
-ID_DLG_PROXY DIALOG 6, 18, 249, 124
+ID_DLG_PROXY DIALOG 6, 18, 249, 104
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Proxy"
 FONT 8, "Microsoft Sans Serif"
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 BEGIN
-    GROUPBOX "   ", 201, 6, 42, 235, 52
+    GROUPBOX "   ", 201, 6, 46, 235, 52
     AUTORADIOBUTTON "Usar aquivo de configuração do OpenVPN", ID_RB_PROXY_OPENVPN, \
-                    13, 12, 200, 10, WS_GROUP | WS_TABSTOP
+                    13, 16, 200, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Usar configurações do Internet Explorer", \
-                    ID_RB_PROXY_MSIE, 13, 27, 200, 10
-    AUTORADIOBUTTON "Configuração manual", ID_RB_PROXY_MANUAL, 13, 42, 80, 10
-    AUTORADIOBUTTON "HTTP Proxy", ID_RB_PROXY_HTTP, 20, 58, 90, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "SOCKS Proxy", ID_RB_PROXY_SOCKS, 120, 58, 90, 10
-    LTEXT "Endereço:", ID_TXT_PROXY_ADDRESS, 20, 73, 37, 10
-    RTEXT "Porta:", ID_TXT_PROXY_PORT, 167, 73, 24, 10
-    EDITTEXT ID_EDT_PROXY_ADDRESS, 58, 71, 108, 12, ES_AUTOHSCROLL
-    EDITTEXT ID_EDT_PROXY_PORT, 196, 71, 30, 12, ES_AUTOHSCROLL
-    AUTOCHECKBOX "Perguntar usuário/senha quando estiver conectando.", ID_CB_PROXY_AUTH, 13, 103, 183, 10
+                    ID_RB_PROXY_MSIE, 13, 31, 200, 10
+    AUTORADIOBUTTON "Configuração manual", ID_RB_PROXY_MANUAL, 13, 46, 80, 10
+    AUTORADIOBUTTON "HTTP Proxy", ID_RB_PROXY_HTTP, 20, 62, 90, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "SOCKS Proxy", ID_RB_PROXY_SOCKS, 120, 62, 90, 10
+    LTEXT "Endereço:", ID_TXT_PROXY_ADDRESS, 20, 77, 37, 10
+    RTEXT "Porta:", ID_TXT_PROXY_PORT, 167, 77, 24, 10
+    EDITTEXT ID_EDT_PROXY_ADDRESS, 58, 75, 108, 12, ES_AUTOHSCROLL
+    EDITTEXT ID_EDT_PROXY_PORT, 196, 75, 30, 12, ES_AUTOHSCROLL
 END
 
 /* Proxy Authentication Dialog */
@@ -303,7 +302,6 @@ BEGIN
     IDS_ERR_SOCKS_PROXY_PORT_RANGE "Você precisa especificar uma porta entre 1-65535 para o proxy SOCKS"
     IDS_ERR_CREATE_REG_HKCU_KEY "Erro criando chave ""HKEY_CURRENT_USER\\%s""."
     IDS_ERR_GET_TEMP_PATH "Erro ao determinar TempPath com GetTempPath(). Usando ""C:\\"" no lugar."
-    IDS_ERR_CREATE_AUTH_FILE "Erro criando arquivo AUTH. (%s)"
 
     /* service */
     IDS_ERR_OPEN_SCMGR_ADMIN "OpenSCManager falhou. Você precisa ter permissões de Administrador para iniciar um serviço."
diff --git a/openvpn-gui-res-se.rc b/openvpn-gui-res-se.rc
index 7480c51..b8ac954 100644
--- a/openvpn-gui-res-se.rc
+++ b/openvpn-gui-res-se.rc
@@ -104,25 +104,24 @@ BEGIN
 END
 
 /* Proxy Settings Dialog */
-ID_DLG_PROXY DIALOG 6, 18, 249, 124
+ID_DLG_PROXY DIALOG 6, 18, 249, 104
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Proxy"
 FONT 8, "Microsoft Sans Serif"
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 BEGIN
-    GROUPBOX "   ", 201, 6, 42, 235, 52
+    GROUPBOX "   ", 201, 6, 46, 235, 52
     AUTORADIOBUTTON "Använd inställningar från OpenVPNs konfigurations fil", ID_RB_PROXY_OPENVPN, \
-                    13, 12, 200, 10, WS_GROUP | WS_TABSTOP
+                    13, 16, 200, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Använd inställningar från Internet Explorer", \
-                    ID_RB_PROXY_MSIE, 13, 27, 200, 10
-    AUTORADIOBUTTON "Manuell Konfigurering", ID_RB_PROXY_MANUAL, 13, 42, 81, 10
-    AUTORADIOBUTTON "HTTP Proxy", ID_RB_PROXY_HTTP, 20, 58, 90, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "SOCKS Proxy", ID_RB_PROXY_SOCKS, 120, 58, 90, 10
-    LTEXT "Adress:", ID_TXT_PROXY_ADDRESS, 20, 73, 28, 10
-    RTEXT "Port:", ID_TXT_PROXY_PORT, 171, 73, 20, 10
-    EDITTEXT ID_EDT_PROXY_ADDRESS, 49, 71, 121, 12, ES_AUTOHSCROLL
-    EDITTEXT ID_EDT_PROXY_PORT, 196, 71, 30, 12, ES_AUTOHSCROLL
-    AUTOCHECKBOX "Fråga efter användarnamn/lösenord vid uppkoppling.", ID_CB_PROXY_AUTH, 13, 103, 183, 10
+                    ID_RB_PROXY_MSIE, 13, 31, 200, 10
+    AUTORADIOBUTTON "Manuell Konfigurering", ID_RB_PROXY_MANUAL, 13, 46, 81, 10
+    AUTORADIOBUTTON "HTTP Proxy", ID_RB_PROXY_HTTP, 20, 62, 90, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "SOCKS Proxy", ID_RB_PROXY_SOCKS, 120, 62, 90, 10
+    LTEXT "Adress:", ID_TXT_PROXY_ADDRESS, 20, 77, 28, 10
+    RTEXT "Port:", ID_TXT_PROXY_PORT, 171, 77, 20, 10
+    EDITTEXT ID_EDT_PROXY_ADDRESS, 49, 75, 121, 12, ES_AUTOHSCROLL
+    EDITTEXT ID_EDT_PROXY_PORT, 196, 75, 30, 12, ES_AUTOHSCROLL
 END
 
 /* Proxy Authentication Dialog */
@@ -302,7 +301,6 @@ BEGIN
     IDS_ERR_SOCKS_PROXY_PORT_RANGE "Du måste ange en SOCKS proxy port mellan 1-65535"
     IDS_ERR_CREATE_REG_HKCU_KEY "Ett fel uppstod vid skapande av register nyckel ""HKEY_CURRENT_USER\\%s"""
     IDS_ERR_GET_TEMP_PATH "Ett fel uppstod när GetTempPath() anropades. Använder ""C:\\"" istället."
-    IDS_ERR_CREATE_AUTH_FILE "Ett fel uppstod vid skapande av AUTH fil (%s)"
 
     /* service */
     IDS_ERR_OPEN_SCMGR_ADMIN "Ett fel uppstod vid öppnande av Service Managern. Du saknar förmodligen rättighet att starta/stoppa en service."
diff --git a/openvpn-gui-res.h b/openvpn-gui-res.h
index 6901710..8a94c67 100644
--- a/openvpn-gui-res.h
+++ b/openvpn-gui-res.h
@@ -67,7 +67,6 @@
 #define ID_EDT_PROXY_PORT                215
 #define ID_TXT_PROXY_ADDRESS             216
 #define ID_TXT_PROXY_PORT                217
-#define ID_CB_PROXY_AUTH                 218
 
 /* General Settings Dialog */
 #define ID_DLG_GENERAL                   230
@@ -213,7 +212,6 @@
 #define IDS_ERR_SOCKS_PROXY_PORT_RANGE  1606
 #define IDS_ERR_CREATE_REG_HKCU_KEY     1607
 #define IDS_ERR_GET_TEMP_PATH           1608
-#define IDS_ERR_CREATE_AUTH_FILE        1609
 
 /* General Settings Dialog */
 #define IDS_LANGUAGE_NAME               1650
diff --git a/openvpn.c b/openvpn.c
index d6ddb91..29d82d9 100644
--- a/openvpn.c
+++ b/openvpn.c
@@ -47,7 +47,7 @@
 
 extern options_t o;
 
-static const TCHAR cfgProp[] = _T("conn");
+const TCHAR *cfgProp = _T("conn");
 
 /*
  * Receive banner on connection to management interface
@@ -176,7 +176,6 @@ OnStateChange(connection_t *c, char *data)
 
         SetMenuStatus(c, connected);
         SetTrayIcon(connected);
-        DeleteFile(o.proxy_authfile);
 
         SetDlgItemText(c->hwndStatus, ID_TXT_STATUS, LoadLocalizedString(IDS_NFO_STATE_CONNECTED));
         SetStatusWinIcon(c->hwndStatus, ID_ICO_CONNECTED);
@@ -339,6 +338,10 @@ OnPassword(connection_t *c, char *msg)
     {
         LocalizedDialogBoxParam(ID_DLG_PASSPHRASE, PrivKeyPassDialogFunc, (LPARAM) c);
     }
+    else if (strstr(msg, "'HTTP Proxy'"))
+    {
+        LocalizedDialogBoxParam(ID_DLG_PROXY_AUTH, ProxyAuthDialogFunc, (LPARAM) c);
+    }
 }
 
 
@@ -350,7 +353,6 @@ OnStop(connection_t *c, char *msg)
 {
     UINT txt_id, msg_id;
     SetMenuStatus(c, disconnected);
-    DeleteFile(o.proxy_authfile);
 
     switch (c->state)
     {
diff --git a/openvpn.h b/openvpn.h
index fc38f1c..be1d48e 100644
--- a/openvpn.h
+++ b/openvpn.h
@@ -36,4 +36,6 @@ void OnStateChange(connection_t *, char *);
 void OnPassword(connection_t *, char *);
 void OnStop(connection_t *, char *);
 
+extern const TCHAR *cfgProp;
+
 #endif
diff --git a/options.h b/options.h
index 06fc35f..6e7b4bf 100644
--- a/options.h
+++ b/options.h
@@ -114,12 +114,10 @@ typedef struct {
     /* Proxy Settings */
     proxy_source_t proxy_source;      /* Where to get proxy information from */
     proxy_t proxy_type;               /* The type of proxy to use */
-    BOOL proxy_http_auth;             /* TRUE is proxy authentication is used */
     TCHAR proxy_http_address[100];    /* HTTP Proxy Address */
     TCHAR proxy_http_port[6];         /* HTTP Proxy Port */
     TCHAR proxy_socks_address[100];   /* SOCKS Proxy Address */
     TCHAR proxy_socks_port[6];        /* SOCKS Proxy Address */
-    TCHAR proxy_authfile[100];        /* Path to proxy auth file */
 
     /* Registry values */
     TCHAR exe_path[MAX_PATH];
diff --git a/proxy.c b/proxy.c
index 7480f1f..c8e69d3 100644
--- a/proxy.c
+++ b/proxy.c
@@ -2,7 +2,7 @@
  *  OpenVPN-GUI -- A Windows GUI for OpenVPN.
  *
  *  Copyright (C) 2004 Mathias Sundman <mathias@nilings.se>
- *                2009 Heiko Hund <heikoh@users.sf.net>
+ *                2011 Heiko Hund <heikoh@users.sf.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -20,6 +20,8 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define WINVER 0x0500
+
 #include <windows.h>
 #include <prsht.h>
 #include <tchar.h>
@@ -32,6 +34,8 @@
 #include "proxy.h"
 #include "openvpn-gui-res.h"
 #include "localization.h"
+#include "manage.h"
+#include "openvpn.h"
 
 extern options_t o;
 
@@ -67,7 +71,6 @@ bool CALLBACK ProxySettingsDialogFunc (HWND hwndDlg, UINT msg, WPARAM wParam, UN
               EnableWindow(GetDlgItem(hwndDlg, ID_EDT_PROXY_PORT), FALSE);
               EnableWindow(GetDlgItem(hwndDlg, ID_TXT_PROXY_ADDRESS), FALSE);
               EnableWindow(GetDlgItem(hwndDlg, ID_TXT_PROXY_PORT), FALSE);
-              EnableWindow(GetDlgItem(hwndDlg, ID_CB_PROXY_AUTH), FALSE);
             }
           break;
 
@@ -80,7 +83,6 @@ bool CALLBACK ProxySettingsDialogFunc (HWND hwndDlg, UINT msg, WPARAM wParam, UN
               EnableWindow(GetDlgItem(hwndDlg, ID_EDT_PROXY_PORT), FALSE);
               EnableWindow(GetDlgItem(hwndDlg, ID_TXT_PROXY_ADDRESS), FALSE);
               EnableWindow(GetDlgItem(hwndDlg, ID_TXT_PROXY_PORT), FALSE);
-              EnableWindow(GetDlgItem(hwndDlg, ID_CB_PROXY_AUTH), TRUE);
             }
           break;
 
@@ -93,15 +95,12 @@ bool CALLBACK ProxySettingsDialogFunc (HWND hwndDlg, UINT msg, WPARAM wParam, UN
               EnableWindow(GetDlgItem(hwndDlg, ID_EDT_PROXY_PORT), TRUE);
               EnableWindow(GetDlgItem(hwndDlg, ID_TXT_PROXY_ADDRESS), TRUE);
               EnableWindow(GetDlgItem(hwndDlg, ID_TXT_PROXY_PORT), TRUE);
-              EnableWindow(GetDlgItem(hwndDlg, ID_CB_PROXY_AUTH),
-                (IsDlgButtonChecked(hwndDlg, ID_RB_PROXY_HTTP) == BST_CHECKED ? TRUE : FALSE));
             }
           break;
 
         case ID_RB_PROXY_HTTP:
           if (HIWORD(wParam) == BN_CLICKED)
             {
-              EnableWindow(GetDlgItem(hwndDlg, ID_CB_PROXY_AUTH), TRUE);
               SetDlgItemText(hwndDlg, ID_EDT_PROXY_ADDRESS, o.proxy_http_address);
               SetDlgItemText(hwndDlg, ID_EDT_PROXY_PORT, o.proxy_http_port);
             }
@@ -110,7 +109,6 @@ bool CALLBACK ProxySettingsDialogFunc (HWND hwndDlg, UINT msg, WPARAM wParam, UN
         case ID_RB_PROXY_SOCKS:
           if (HIWORD(wParam) == BN_CLICKED)
             {
-              EnableWindow(GetDlgItem(hwndDlg, ID_CB_PROXY_AUTH), FALSE);
               SetDlgItemText(hwndDlg, ID_EDT_PROXY_ADDRESS, o.proxy_socks_address);
               SetDlgItemText(hwndDlg, ID_EDT_PROXY_PORT, o.proxy_socks_port);
             }
@@ -178,40 +176,46 @@ int CheckProxySettings(HWND hwndDlg)
   return(1);
 }
 
-void LoadProxySettings(HWND hwndDlg)
+
+void
+LoadProxySettings(HWND hwndDlg)
 {
-  /* Set Proxy type, address and port */
-  if (o.proxy_type == http)  /* HTTP Proxy */
+    /* Set Proxy type, address and port */
+    if (o.proxy_type == http)
     {
-      CheckRadioButton(hwndDlg, ID_RB_PROXY_HTTP, ID_RB_PROXY_SOCKS, ID_RB_PROXY_HTTP);
-      SetDlgItemText(hwndDlg, ID_EDT_PROXY_ADDRESS, o.proxy_http_address);
-      SetDlgItemText(hwndDlg, ID_EDT_PROXY_PORT, o.proxy_http_port);
+        CheckRadioButton(hwndDlg, ID_RB_PROXY_HTTP, ID_RB_PROXY_SOCKS, ID_RB_PROXY_HTTP);
+        SetDlgItemText(hwndDlg, ID_EDT_PROXY_ADDRESS, o.proxy_http_address);
+        SetDlgItemText(hwndDlg, ID_EDT_PROXY_PORT, o.proxy_http_port);
     }
-  else			  /* SOCKS Proxy */
+    else if (o.proxy_type == socks)
     {
-      CheckRadioButton(hwndDlg, ID_RB_PROXY_HTTP, ID_RB_PROXY_SOCKS, ID_RB_PROXY_SOCKS);
-      SetDlgItemText(hwndDlg, ID_EDT_PROXY_ADDRESS, o.proxy_socks_address);
-      SetDlgItemText(hwndDlg, ID_EDT_PROXY_PORT, o.proxy_socks_port);
+        CheckRadioButton(hwndDlg, ID_RB_PROXY_HTTP, ID_RB_PROXY_SOCKS, ID_RB_PROXY_SOCKS);
+        SetDlgItemText(hwndDlg, ID_EDT_PROXY_ADDRESS, o.proxy_socks_address);
+        SetDlgItemText(hwndDlg, ID_EDT_PROXY_PORT, o.proxy_socks_port);
     }
 
-  if (o.proxy_http_auth) CheckDlgButton(hwndDlg, ID_CB_PROXY_AUTH, BST_CHECKED);
-
-  /* Set Proxy Settings Source */
-  if (o.proxy_source == config)
-    SendMessage(GetDlgItem(hwndDlg, ID_RB_PROXY_OPENVPN), BM_CLICK, 0, 0);
-  if (o.proxy_source == browser)
-    SendMessage(GetDlgItem(hwndDlg, ID_RB_PROXY_MSIE), BM_CLICK, 0, 0);
-  if (o.proxy_source == manual)
-    SendMessage(GetDlgItem(hwndDlg, ID_RB_PROXY_MANUAL), BM_CLICK, 0, 0);
+    /* Set Proxy Settings Source */
+    if (o.proxy_source == config)
+    {
+        SendMessage(GetDlgItem(hwndDlg, ID_RB_PROXY_OPENVPN), BM_CLICK, 0, 0);
+    }
+    else if (o.proxy_source == browser)
+    {
+        SendMessage(GetDlgItem(hwndDlg, ID_RB_PROXY_MSIE), BM_CLICK, 0, 0);
+    }
+    else if (o.proxy_source == manual)
+    {
+        SendMessage(GetDlgItem(hwndDlg, ID_RB_PROXY_MANUAL), BM_CLICK, 0, 0);
+    }
 }
 
+
 void SaveProxySettings(HWND hwndDlg)
 {
   HKEY regkey;
   DWORD dwDispos;
   TCHAR proxy_source_string[2] = _T("0");
   TCHAR proxy_type_string[2] = _T("0");
-  TCHAR proxy_http_auth_string[2] = _T("0");
 
   /* Save Proxy Settings Source */
   if (IsDlgButtonChecked(hwndDlg, ID_RB_PROXY_OPENVPN) == BST_CHECKED)
@@ -240,10 +244,6 @@ void SaveProxySettings(HWND hwndDlg)
                  _tsizeof(o.proxy_http_address));
       GetDlgItemText(hwndDlg, ID_EDT_PROXY_PORT, o.proxy_http_port, 
                  _tsizeof(o.proxy_http_port));
-
-      BOOL auth = (IsDlgButtonChecked(hwndDlg, ID_CB_PROXY_AUTH) == BST_CHECKED);
-      o.proxy_http_auth = (auth ? 1 : 0);
-      proxy_http_auth_string[0] = (auth ? _T('1') : _T('0'));
     }
   else
     {
@@ -275,7 +275,6 @@ void SaveProxySettings(HWND hwndDlg)
   /* Save Settings to registry */
   SetRegistryValue(regkey, _T("proxy_source"), proxy_source_string);
   SetRegistryValue(regkey, _T("proxy_type"), proxy_type_string);
-  SetRegistryValue(regkey, _T("proxy_http_auth"), proxy_http_auth_string);
   SetRegistryValue(regkey, _T("proxy_http_address"), o.proxy_http_address);
   SetRegistryValue(regkey, _T("proxy_http_port"), o.proxy_http_port);
   SetRegistryValue(regkey, _T("proxy_socks_address"), o.proxy_socks_address);
@@ -290,19 +289,6 @@ void GetProxyRegistrySettings()
   HKEY regkey;
   TCHAR proxy_source_string[2] = _T("0");
   TCHAR proxy_type_string[2] = _T("0");
-  TCHAR proxy_http_auth_string[2] = _T("0");
-  TCHAR temp_path[100];
-
-  /* Construct Authfile path */
-  if (!GetTempPath(_tsizeof(temp_path) - 1, temp_path))
-    {
-      /* Error getting TempPath - using C:\ */
-      ShowLocalizedMsg(IDS_ERR_GET_TEMP_PATH);
-      _tcscpy(temp_path, _T("C:\\"));
-    }
-  _tcsncat(temp_path, _T("openvpn_authfile.txt"), 
-          _tsizeof(temp_path) - _tcslen(temp_path) - 1); 
-  _tcsncpy(o.proxy_authfile, temp_path, _tsizeof(o.proxy_authfile));
 
   /* Open Registry for reading */
   status = RegOpenKeyEx(HKEY_CURRENT_USER,
@@ -328,8 +314,6 @@ void GetProxyRegistrySettings()
                    _tsizeof(proxy_source_string));
   GetRegistryValue(regkey, _T("proxy_type"), proxy_type_string, 
                    _tsizeof(proxy_type_string));
-  GetRegistryValue(regkey, _T("proxy_http_auth"), proxy_http_auth_string, 
-                   _tsizeof(proxy_http_auth_string));
 
   if (proxy_source_string[0] == _T('1'))
     o.proxy_source = config;
@@ -341,53 +325,68 @@ void GetProxyRegistrySettings()
   if (proxy_type_string[0] == _T('1'))
     o.proxy_type = socks;
 
-  if (proxy_http_auth_string[0] == _T('1'))
-    o.proxy_http_auth = TRUE;
-
   RegCloseKey(regkey);
 }
 
-BOOL CALLBACK ProxyAuthDialogFunc (HWND hwndDlg, UINT msg, WPARAM wParam, UNUSED LPARAM lParam)
-{
-  TCHAR username[50];
-  TCHAR password[50];
-  FILE *fp;
 
-  switch (msg) {
+BOOL CALLBACK
+ProxyAuthDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+    connection_t *c;
+    TCHAR buf[50];
+    char cmd[70] = "username \"HTTP Proxy\" \"";
+    UINT username_len;
+    int length;
 
+    switch (msg)
+    {
     case WM_INITDIALOG:
-      //SetForegroundWindow(hwndDlg);
-      break;
+        /* Set connection for this dialog */
+        SetProp(hwndDlg, cfgProp, (HANDLE) lParam);
+        SetForegroundWindow(hwndDlg);
+        break;
 
     case WM_COMMAND:
-      switch (LOWORD(wParam)) {
-
+        switch (LOWORD(wParam))
+        {
         case IDOK:
-          GetDlgItemText(hwndDlg, ID_EDT_PROXY_USER, username, _tsizeof(username) - 1);
-          GetDlgItemText(hwndDlg, ID_EDT_PROXY_PASS, password, _tsizeof(password) - 1);
-          if (!(fp = _tfopen(o.proxy_authfile, _T("w"))))
-            {
-              /* error creating AUTH file */
-              ShowLocalizedMsg(IDS_ERR_CREATE_AUTH_FILE, o.proxy_authfile);
-              EndDialog(hwndDlg, LOWORD(wParam));
-            }
-          _fputts(username, fp);
-          _fputts(_T("\n"), fp);
-          _fputts(password, fp);
-          _fputts(_T("\n"), fp);
-          fclose(fp);
-          EndDialog(hwndDlg, LOWORD(wParam));
-          return TRUE;
-      }
-      break;
+            c = (connection_t *) GetProp(hwndDlg, cfgProp);
+            username_len = GetDlgItemText(hwndDlg, ID_EDT_PROXY_USER, buf, _tsizeof(buf));
+            if (username_len == 0)
+                return TRUE;
+            length = WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, buf, -1, cmd + 23, sizeof(cmd) - 23, "_", NULL);
+            memcpy(cmd + length + 22, "\"\0", 2);
+            ManagementCommand(c, cmd, NULL, regular);
+
+            memcpy(cmd, "password", 8);
+            GetDlgItemText(hwndDlg, ID_EDT_PROXY_PASS, buf, _tsizeof(buf));
+            length = WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, buf, -1, cmd + 23, sizeof(cmd) - 23, "_", NULL);
+            memcpy(cmd + length + 22, "\"\0", 2);
+            ManagementCommand(c, cmd, NULL, regular);
+
+            /* Clear buffers */
+            memset(buf, 'x', sizeof(buf));
+            buf[sizeof(buf) - 1] = _T('\0');
+            SetDlgItemText(hwndDlg, ID_EDT_PROXY_USER, buf);
+            SetDlgItemText(hwndDlg, ID_EDT_PROXY_PASS, buf);
+
+            EndDialog(hwndDlg, LOWORD(wParam));
+            return TRUE;
+        }
+        break;
+
     case WM_CLOSE:
-      EndDialog(hwndDlg, LOWORD(wParam));
-      return TRUE;
-     
-  }
-  return FALSE;
+        EndDialog(hwndDlg, LOWORD(wParam));
+        return TRUE;
+
+    case WM_NCDESTROY:
+        RemoveProp(hwndDlg, cfgProp);
+        break;
+    }
+    return FALSE;
 }
 
+
 /*
  * GetIeHttpProxy() fetches the current IE proxy settings for HTTP.
  * Coded by Ewan Bhamrah Harley <code@ewan.info>, but refactored.
@@ -458,66 +457,37 @@ GetIeHttpProxy(TCHAR *host, size_t *hostlen, TCHAR *port, size_t *portlen)
   return TRUE;
 }
 
+
 /*
  * Construct the proxy options to append to the cmd-line.
  */
-void ConstructProxyCmdLine(TCHAR *proxy_string_ptr, unsigned int size)
+void ConstructProxyCmdLine(TCHAR *proxy_string, unsigned int size)
 {
-  TCHAR proxy_string[100];
-
-  CLEAR(proxy_string);
-
-  if (o.proxy_source == manual)
+    if (o.proxy_source == manual)
     {
-      if (o.proxy_type == http)
+        if (o.proxy_type == http)
         {
-          if (o.proxy_http_auth)
-            {
-              /* Ask for Proxy username/password */
-              LocalizedDialogBox(ID_DLG_PROXY_AUTH, ProxyAuthDialogFunc);
-              _sntprintf_0(proxy_string, _T("--http-proxy %s %s %s"),
-                           o.proxy_http_address,
-                           o.proxy_http_port,
-                           o.proxy_authfile);
-            }
-          else
-            {
-              _sntprintf_0(proxy_string, _T("--http-proxy %s %s"),
-                           o.proxy_http_address,
-                           o.proxy_http_port);
-            }
+            __sntprintf_0(proxy_string, size, _T(" --http-proxy %s %s auto"),
+                          o.proxy_http_address, o.proxy_http_port);
         }
-      if (o.proxy_type == socks)
+        else if (o.proxy_type == socks)
         {
-          _sntprintf_0(proxy_string, _T("--socks-proxy %s %s"),
-                       o.proxy_socks_address,
-                       o.proxy_socks_port);
+            __sntprintf_0(proxy_string, size, _T(" --socks-proxy %s %s"),
+                          o.proxy_socks_address, o.proxy_socks_port);
         }
     }
-
-  else if (o.proxy_source == browser)
+    else if (o.proxy_source == browser)
     {
-      TCHAR host[64];
-      TCHAR port[6];
-      size_t hostlen = _tsizeof(host);
-      size_t portlen = _tsizeof(port);
+        TCHAR host[64];
+        TCHAR port[6];
+        size_t hostlen = _tsizeof(host);
 
-      if (GetIeHttpProxy(host, &hostlen, port, &portlen) && hostlen != 0)
+        size_t portlen = _tsizeof(port);
+
+        if (GetIeHttpProxy(host, &hostlen, port, &portlen) && hostlen != 0)
         {
-          if (o.proxy_http_auth)
-            {
-              /* Ask for Proxy username/password */
-              LocalizedDialogBox(ID_DLG_PROXY_AUTH, ProxyAuthDialogFunc);
-              _sntprintf_0(proxy_string, _T("--http-proxy %s %s %s"),
-                           host, (portlen ? port : _T("80")), o.proxy_authfile);
-            }
-          else
-            {
-              _sntprintf_0(proxy_string, _T("--http-proxy %s %s"),
-                           host, (portlen ? port : _T("80")));
-            }
+            __sntprintf_0(proxy_string, size, _T(" --http-proxy %s %s auto"),
+                          host, (portlen ? port : _T("8080")));
         }
     }
-
-  _tcsncpy(proxy_string_ptr, proxy_string, size);
 }