diff --git a/options.c b/options.c
index 2ed8105..ff99a25 100644
--- a/options.c
+++ b/options.c
@@ -686,10 +686,6 @@ LoadAdvancedDlgParams (HWND hdlg)
 #ifdef ENABLE_OVPN3
     CheckRadioButton(hdlg, ID_RB_ENGINE_OVPN2, ID_RB_ENGINE_OVPN3,
         o.ovpn_engine == OPENVPN_ENGINE_OVPN3 ? ID_RB_ENGINE_OVPN3 : ID_RB_ENGINE_OVPN2);
-#else
-    ShowWindow(GetDlgItem(hdlg, ID_RB_ENGINE_SELECTION), SW_HIDE);
-    ShowWindow(GetDlgItem(hdlg, ID_RB_ENGINE_OVPN2), SW_HIDE);
-    ShowWindow(GetDlgItem(hdlg, ID_RB_ENGINE_OVPN3), SW_HIDE);
 #endif
 }
 
diff --git a/res/openvpn-gui-res-cs.rc b/res/openvpn-gui-res-cs.rc
index 9d6d4c2..d8614cb 100644
--- a/res/openvpn-gui-res-cs.rc
+++ b/res/openvpn-gui-res-cs.rc
@@ -169,7 +169,11 @@ BEGIN
 END
 
 /* Advanced Dialog */
+#if ENABLE_OVPN3
+ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 320
+#else
 ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 280
+#endif
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Pokročilé"
 FONT 8, "Microsoft Sans Serif"
@@ -210,10 +214,12 @@ BEGIN
     LTEXT "Repeated messages are muted for: ", 208, 17, 260, 125, 10
     EDITTEXT ID_EDT_POPUP_MUTE, 150, 258, 30, 12, ES_AUTOHSCROLL
     LTEXT "hours", 209, 190, 260, 40, 10
+#if ENABLE_OVPN3
 
-    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
-    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
+    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 283, 235, 30
+    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 296, 50, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 296, 90, 10
+#endif
 END
 
 /* About Dialog */
diff --git a/res/openvpn-gui-res-de.rc b/res/openvpn-gui-res-de.rc
index b7e6fe3..d4a7c80 100644
--- a/res/openvpn-gui-res-de.rc
+++ b/res/openvpn-gui-res-de.rc
@@ -170,7 +170,11 @@ BEGIN
 END
 
 /* Advanced Dialog */
+#if ENABLE_OVPN3
+ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 320
+#else
 ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 280
+#endif
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Erweitert"
 FONT 8, "Microsoft Sans Serif"
@@ -212,9 +216,9 @@ BEGIN
     EDITTEXT ID_EDT_POPUP_MUTE, 150, 258, 30, 12, ES_AUTOHSCROLL
     LTEXT "hours", 209, 190, 260, 40, 10
 
-    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
-    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
+    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 283, 235, 30
+    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 296, 50, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 296, 90, 10
 END
 
 /* About Dialog */
diff --git a/res/openvpn-gui-res-dk.rc b/res/openvpn-gui-res-dk.rc
index ded4527..10ab07d 100644
--- a/res/openvpn-gui-res-dk.rc
+++ b/res/openvpn-gui-res-dk.rc
@@ -169,7 +169,11 @@ BEGIN
 END
 
 /* Advanced Dialog */
+#if ENABLE_OVPN3
+ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 320
+#else
 ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 280
+#endif
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Avanceret"
 FONT 8, "Microsoft Sans Serif"
@@ -210,10 +214,12 @@ BEGIN
     LTEXT "Repeated messages are muted for: ", 208, 17, 260, 125, 10
     EDITTEXT ID_EDT_POPUP_MUTE, 150, 258, 30, 12, ES_AUTOHSCROLL
     LTEXT "hours", 209, 190, 260, 40, 10
+#if ENABLE_OVPN3
 
-    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
-    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
+    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 283, 235, 30
+    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 296, 50, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 296, 90, 10
+#endif
 END
 
 /* About Dialog */
diff --git a/res/openvpn-gui-res-en.rc b/res/openvpn-gui-res-en.rc
index bb47f2b..1a68bdd 100644
--- a/res/openvpn-gui-res-en.rc
+++ b/res/openvpn-gui-res-en.rc
@@ -183,7 +183,11 @@ BEGIN
 END
 
 /* Advanced Dialog */
+#if ENABLE_OVPN3
+ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 320
+#else
 ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 280
+#endif
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Advanced"
 FONT 8, "Microsoft Sans Serif"
@@ -224,10 +228,12 @@ BEGIN
     LTEXT "Repeated messages are muted for: ", 208, 17, 260, 125, 10
     EDITTEXT ID_EDT_POPUP_MUTE, 150, 258, 30, 12, ES_AUTOHSCROLL
     LTEXT "hours", 209, 190, 260, 40, 10
+#if ENABLE_OVPN3
 
-    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
-    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
+    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 283, 235, 30
+    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 296, 50, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 296, 90, 10
+#endif
 END
 
 /* About Dialog */
diff --git a/res/openvpn-gui-res-es.rc b/res/openvpn-gui-res-es.rc
index f4dd661..088f302 100644
--- a/res/openvpn-gui-res-es.rc
+++ b/res/openvpn-gui-res-es.rc
@@ -167,7 +167,11 @@ BEGIN
 END
 
 /* Advanced Dialog */
+#if ENABLE_OVPN3
+ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 320
+#else
 ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 280
+#endif
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Advanced"
 FONT 8, "Microsoft Sans Serif"
@@ -208,10 +212,12 @@ BEGIN
     LTEXT "Repeated messages are muted for: ", 208, 17, 260, 125, 10
     EDITTEXT ID_EDT_POPUP_MUTE, 150, 258, 30, 12, ES_AUTOHSCROLL
     LTEXT "hours", 209, 190, 260, 40, 10
+#if ENABLE_OVPN3
 
-    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
-    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
+    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 283, 235, 30
+    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 296, 50, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 296, 90, 10
+#endif
 END
 
 /* About Dialog */
diff --git a/res/openvpn-gui-res-fa.rc b/res/openvpn-gui-res-fa.rc
index 7f225a9..c44285e 100644
--- a/res/openvpn-gui-res-fa.rc
+++ b/res/openvpn-gui-res-fa.rc
@@ -171,7 +171,11 @@ BEGIN
 END
 
 /* Advanced Dialog */
+#if ENABLE_OVPN3
+ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 320
+#else
 ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 280
+#endif
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "پیشرفته"
 FONT 8, "Microsoft Sans Serif"
@@ -212,7 +216,12 @@ BEGIN
     LTEXT "Repeated messages are muted for: ", 208, 17, 260, 125, 10
     EDITTEXT ID_EDT_POPUP_MUTE, 150, 258, 30, 12, ES_AUTOHSCROLL
     LTEXT "hours", 209, 190, 260, 40, 10
+#if ENABLE_OVPN3
 
+    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 283, 235, 30
+    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 296, 50, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 296, 90, 10
+#endif
 END
 
 /* About Dialog */
diff --git a/res/openvpn-gui-res-fi.rc b/res/openvpn-gui-res-fi.rc
index 2ac4ea2..fd37dec 100644
--- a/res/openvpn-gui-res-fi.rc
+++ b/res/openvpn-gui-res-fi.rc
@@ -168,7 +168,11 @@ BEGIN
 END
 
 /* Advanced Dialog */
+#if ENABLE_OVPN3
+ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 320
+#else
 ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 280
+#endif
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Lisäasetukset"
 FONT 8, "Microsoft Sans Serif"
@@ -209,10 +213,12 @@ BEGIN
     LTEXT "Repeated messages are muted for: ", 208, 17, 260, 125, 10
     EDITTEXT ID_EDT_POPUP_MUTE, 150, 258, 30, 12, ES_AUTOHSCROLL
     LTEXT "hours", 209, 190, 260, 40, 10
+#if ENABLE_OVPN3
 
-    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
-    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
+    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 283, 235, 30
+    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 296, 50, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 296, 90, 10
+#endif
 END
 
 /* About Dialog */
diff --git a/res/openvpn-gui-res-fr.rc b/res/openvpn-gui-res-fr.rc
index d24e33f..35d54b4 100644
--- a/res/openvpn-gui-res-fr.rc
+++ b/res/openvpn-gui-res-fr.rc
@@ -168,7 +168,11 @@ BEGIN
 END
 
 /* Advanced Dialog */
+#if ENABLE_OVPN3
+ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 320
+#else
 ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 280
+#endif
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Avancé"
 FONT 8, "Microsoft Sans Serif"
@@ -209,10 +213,12 @@ BEGIN
     LTEXT "Repeated messages are muted for: ", 208, 17, 260, 125, 10
     EDITTEXT ID_EDT_POPUP_MUTE, 150, 258, 30, 12, ES_AUTOHSCROLL
     LTEXT "hours", 209, 190, 260, 40, 10
+#if ENABLE_OVPN3
 
-    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
-    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
+    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 283, 235, 30
+    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 296, 50, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 296, 90, 10
+#endif
 END
 
 /* About Dialog */
diff --git a/res/openvpn-gui-res-it.rc b/res/openvpn-gui-res-it.rc
index c4f485f..b7a1f0f 100644
--- a/res/openvpn-gui-res-it.rc
+++ b/res/openvpn-gui-res-it.rc
@@ -165,14 +165,14 @@ BEGIN
     AUTORADIOBUTTON "Alla &connessione", ID_RB_BALLOON1, 28, 170, 200, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Alla connessione/&riconnessione", ID_RB_BALLOON2, 28, 185, 200, 10
     AUTORADIOBUTTON "&Mai", ID_RB_BALLOON0, 28, 200, 200, 10
-
-    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
-    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
 END
 
 /* Advanced Dialog */
+#if ENABLE_OVPN3
+ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 320
+#else
 ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 280
+#endif
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Avanzate"
 FONT 8, "Microsoft Sans Serif"
@@ -213,7 +213,12 @@ BEGIN
     LTEXT "Repeated messages are muted for: ", 208, 17, 260, 125, 10
     EDITTEXT ID_EDT_POPUP_MUTE, 150, 258, 30, 12, ES_AUTOHSCROLL
     LTEXT "hours", 209, 190, 260, 40, 10
+#if ENABLE_OVPN3
 
+    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 283, 235, 30
+    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 296, 50, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 296, 90, 10
+#endif
 END
 
 /* About Dialog */
diff --git a/res/openvpn-gui-res-jp.rc b/res/openvpn-gui-res-jp.rc
index 100cf27..d4873fe 100644
--- a/res/openvpn-gui-res-jp.rc
+++ b/res/openvpn-gui-res-jp.rc
@@ -169,7 +169,11 @@ BEGIN
 END
 
 /* Advanced Dialog */
+#if ENABLE_OVPN3
+ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 320
+#else
 ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 280
+#endif
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "詳細設定"
 FONT 8, "Microsoft Sans Serif"
@@ -210,10 +214,12 @@ BEGIN
     LTEXT "同じメッセージをミュート: ", 208, 17, 260, 125, 10
     EDITTEXT ID_EDT_POPUP_MUTE, 150, 258, 30, 12, ES_AUTOHSCROLL
     LTEXT "時間", 209, 190, 260, 40, 10
+#if ENABLE_OVPN3
 
-    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
-    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
+    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 283, 235, 30
+    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 296, 50, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 296, 90, 10
+#endif
 END
 
 /* About Dialog */
diff --git a/res/openvpn-gui-res-kr.rc b/res/openvpn-gui-res-kr.rc
index 317d310..a05e3a3 100644
--- a/res/openvpn-gui-res-kr.rc
+++ b/res/openvpn-gui-res-kr.rc
@@ -170,7 +170,11 @@ BEGIN
 END
 
 /* Advanced Dialog */
+#if ENABLE_OVPN3
+ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 320
+#else
 ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 280
+#endif
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "상세"
 FONT 9, "맑은 고딕"
@@ -211,10 +215,12 @@ BEGIN
     LTEXT "Repeated messages are muted for: ", 208, 17, 260, 125, 10
     EDITTEXT ID_EDT_POPUP_MUTE, 150, 258, 30, 12, ES_AUTOHSCROLL
     LTEXT "hours", 209, 190, 260, 40, 10
+#if ENABLE_OVPN3
 
-    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
-    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
+    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 283, 235, 30
+    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 296, 50, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 296, 90, 10
+#endif
 END
 
 /* About Dialog */
diff --git a/res/openvpn-gui-res-nl.rc b/res/openvpn-gui-res-nl.rc
index 3293745..de57305 100644
--- a/res/openvpn-gui-res-nl.rc
+++ b/res/openvpn-gui-res-nl.rc
@@ -166,14 +166,14 @@ BEGIN
     AUTORADIOBUTTON "Bij verbinden", ID_RB_BALLOON1, 28, 170, 50, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Bij opnieuw verbinden", ID_RB_BALLOON2, 86, 170, 90, 10
     AUTORADIOBUTTON "Nooit", ID_RB_BALLOON0, 181, 170, 40, 10
-
-    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
-    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
 END
 
 /* Advanced Dialog */
+#if ENABLE_OVPN3
+ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 320
+#else
 ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 280
+#endif
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Geavanceerd"
 FONT 8, "Microsoft Sans Serif"
@@ -214,7 +214,12 @@ BEGIN
     LTEXT "Repeated messages are muted for: ", 208, 17, 260, 125, 10
     EDITTEXT ID_EDT_POPUP_MUTE, 150, 258, 30, 12, ES_AUTOHSCROLL
     LTEXT "hours", 209, 190, 260, 40, 10
+#if ENABLE_OVPN3
 
+    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 283, 235, 30
+    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 296, 50, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 296, 90, 10
+#endif
 END
 
 /* About Dialog */
diff --git a/res/openvpn-gui-res-no.rc b/res/openvpn-gui-res-no.rc
index 57b3611..07e92f7 100644
--- a/res/openvpn-gui-res-no.rc
+++ b/res/openvpn-gui-res-no.rc
@@ -168,7 +168,11 @@ BEGIN
 END
 
 /* Advanced Dialog */
+#if ENABLE_OVPN3
+ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 320
+#else
 ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 280
+#endif
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Avansert"
 FONT 8, "Microsoft Sans Serif"
@@ -209,10 +213,12 @@ BEGIN
     LTEXT "Repeated messages are muted for: ", 208, 17, 260, 125, 10
     EDITTEXT ID_EDT_POPUP_MUTE, 150, 258, 30, 12, ES_AUTOHSCROLL
     LTEXT "hours", 209, 190, 260, 40, 10
+#if ENABLE_OVPN3
 
-    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
-    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
+    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 283, 235, 30
+    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 296, 50, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 296, 90, 10
+#endif
 END
 
 /* About Dialog */
diff --git a/res/openvpn-gui-res-pl.rc b/res/openvpn-gui-res-pl.rc
index e8dea4c..71b1c6a 100644
--- a/res/openvpn-gui-res-pl.rc
+++ b/res/openvpn-gui-res-pl.rc
@@ -169,7 +169,11 @@ BEGIN
 END
 
 /* Advanced Dialog */
+#if ENABLE_OVPN3
+ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 320
+#else
 ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 280
+#endif
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Zaawansowane"
 FONT 8, "Microsoft Sans Serif"
@@ -210,10 +214,12 @@ BEGIN
     LTEXT "Repeated messages are muted for: ", 208, 17, 260, 125, 10
     EDITTEXT ID_EDT_POPUP_MUTE, 150, 258, 30, 12, ES_AUTOHSCROLL
     LTEXT "hours", 209, 190, 260, 40, 10
+#if ENABLE_OVPN3
 
-    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
-    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
+    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 283, 235, 30
+    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 296, 50, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 296, 90, 10
+#endif
 END
 
 /* About Dialog */
diff --git a/res/openvpn-gui-res-pt.rc b/res/openvpn-gui-res-pt.rc
index 5d4a237..3e87d27 100644
--- a/res/openvpn-gui-res-pt.rc
+++ b/res/openvpn-gui-res-pt.rc
@@ -167,7 +167,11 @@ BEGIN
 END
 
 /* Advanced Dialog */
+#if ENABLE_OVPN3
+ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 320
+#else
 ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 280
+#endif
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Avançado"
 FONT 8, "Microsoft Sans Serif"
@@ -208,10 +212,12 @@ BEGIN
     LTEXT "Repeated messages are muted for: ", 208, 17, 260, 125, 10
     EDITTEXT ID_EDT_POPUP_MUTE, 150, 258, 30, 12, ES_AUTOHSCROLL
     LTEXT "hours", 209, 190, 260, 40, 10
+#if ENABLE_OVPN3
 
-    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
-    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
+    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 283, 235, 30
+    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 296, 50, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 296, 90, 10
+#endif
 END
 
 /* About Dialog */
diff --git a/res/openvpn-gui-res-ru.rc b/res/openvpn-gui-res-ru.rc
index 2c40311..9060e09 100644
--- a/res/openvpn-gui-res-ru.rc
+++ b/res/openvpn-gui-res-ru.rc
@@ -170,7 +170,11 @@ BEGIN
 END
 
 /* Advanced Dialog */
+#if ENABLE_OVPN3
+ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 320
+#else
 ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 280
+#endif
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Расширенные"
 FONT 8, "Microsoft Sans Serif"
@@ -211,10 +215,12 @@ BEGIN
     LTEXT "Repeated messages are muted for: ", 208, 17, 260, 125, 10
     EDITTEXT ID_EDT_POPUP_MUTE, 150, 258, 30, 12, ES_AUTOHSCROLL
     LTEXT "hours", 209, 190, 260, 40, 10
+#if ENABLE_OVPN3
 
-    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
-    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
+    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 283, 235, 30
+    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 296, 50, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 296, 90, 10
+#endif
 END
 
 /* About Dialog */
diff --git a/res/openvpn-gui-res-se.rc b/res/openvpn-gui-res-se.rc
index b208441..e5f2da3 100644
--- a/res/openvpn-gui-res-se.rc
+++ b/res/openvpn-gui-res-se.rc
@@ -167,7 +167,11 @@ BEGIN
 END
 
 /* Advanced Dialog */
+#if ENABLE_OVPN3
+ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 320
+#else
 ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 280
+#endif
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Advanced"
 FONT 8, "Microsoft Sans Serif"
@@ -208,10 +212,12 @@ BEGIN
     LTEXT "Repeated messages are muted for: ", 208, 17, 260, 125, 10
     EDITTEXT ID_EDT_POPUP_MUTE, 150, 258, 30, 12, ES_AUTOHSCROLL
     LTEXT "hours", 209, 190, 260, 40, 10
+#if ENABLE_OVPN3
 
-    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
-    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
+    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 283, 235, 30
+    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 296, 50, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 296, 90, 10
+#endif
 END
 
 /* About Dialog */
diff --git a/res/openvpn-gui-res-tr.rc b/res/openvpn-gui-res-tr.rc
index 8c4982c..dbb8c6f 100644
--- a/res/openvpn-gui-res-tr.rc
+++ b/res/openvpn-gui-res-tr.rc
@@ -169,7 +169,11 @@ BEGIN
 END
 
 /* Advanced Dialog */
+#if ENABLE_OVPN3
+ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 320
+#else
 ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 280
+#endif
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Advanced"
 FONT 8, "Microsoft Sans Serif"
@@ -210,10 +214,12 @@ BEGIN
     LTEXT "Repeated messages are muted for: ", 208, 17, 260, 125, 10
     EDITTEXT ID_EDT_POPUP_MUTE, 150, 258, 30, 12, ES_AUTOHSCROLL
     LTEXT "hours", 209, 190, 260, 40, 10
+#if ENABLE_OVPN3
 
-    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
-    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
+    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 283, 235, 30
+    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 296, 50, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 296, 90, 10
+#endif
 END
 
 /* About Dialog */
diff --git a/res/openvpn-gui-res-ua.rc b/res/openvpn-gui-res-ua.rc
index 4cf336e..55b435a 100644
--- a/res/openvpn-gui-res-ua.rc
+++ b/res/openvpn-gui-res-ua.rc
@@ -168,7 +168,11 @@ BEGIN
 END
 
 /* Advanced Dialog */
+#if ENABLE_OVPN3
+ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 320
+#else
 ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 280
+#endif
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "Додаткові"
 FONT 8, "Microsoft Sans Serif"
@@ -209,10 +213,12 @@ BEGIN
     LTEXT "Repeated messages are muted for: ", 208, 17, 260, 125, 10
     EDITTEXT ID_EDT_POPUP_MUTE, 150, 258, 30, 12, ES_AUTOHSCROLL
     LTEXT "hours", 209, 190, 260, 40, 10
+#if ENABLE_OVPN3
 
-    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
-    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
+    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 283, 235, 30
+    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 296, 50, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 296, 90, 10
+#endif
 END
 
 /* About Dialog */
diff --git a/res/openvpn-gui-res-zh-hans.rc b/res/openvpn-gui-res-zh-hans.rc
index d67cc63..12f472f 100644
--- a/res/openvpn-gui-res-zh-hans.rc
+++ b/res/openvpn-gui-res-zh-hans.rc
@@ -171,7 +171,11 @@ BEGIN
 END
 
 /* Advanced Dialog */
+#if ENABLE_OVPN3
+ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 320
+#else
 ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 280
+#endif
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "高级"
 FONT 8, "Microsoft Sans Serif"
@@ -212,10 +216,12 @@ BEGIN
     LTEXT "Repeated messages are muted for: ", 208, 17, 260, 125, 10
     EDITTEXT ID_EDT_POPUP_MUTE, 150, 258, 30, 12, ES_AUTOHSCROLL
     LTEXT "hours", 209, 190, 260, 40, 10
+#if ENABLE_OVPN3
 
-    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
-    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
+    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 283, 235, 30
+    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 296, 50, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 296, 90, 10
+#endif
 END
 
 /* About Dialog */
diff --git a/res/openvpn-gui-res-zh-hant.rc b/res/openvpn-gui-res-zh-hant.rc
index ca9a2c2..4ca3f16 100644
--- a/res/openvpn-gui-res-zh-hant.rc
+++ b/res/openvpn-gui-res-zh-hant.rc
@@ -171,7 +171,11 @@ BEGIN
 END
 
 /* Advanced Dialog */
+#if ENABLE_OVPN3
+ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 320
+#else
 ID_DLG_ADVANCED DIALOGEX 6, 18, 252, 280
+#endif
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "進階"
 FONT 8, "Microsoft Sans Serif"
@@ -212,10 +216,12 @@ BEGIN
     LTEXT "Repeated messages are muted for: ", 208, 17, 260, 125, 10
     EDITTEXT ID_EDT_POPUP_MUTE, 150, 258, 30, 12, ES_AUTOHSCROLL
     LTEXT "hours", 209, 190, 260, 40, 10
+#if ENABLE_OVPN3
 
-    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
-    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
+    GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 283, 235, 30
+    AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 296, 50, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 296, 90, 10
+#endif
 END
 
 /* About Dialog */