3 files changed, 13 insertions, 13 deletions
diff --git a/plugins/ModernOpt/res/resource.rc b/plugins/ModernOpt/res/resource.rc
index a68d14e023..9df39faf5b 100644
--- a/plugins/ModernOpt/res/resource.rc
+++ b/plugins/ModernOpt/res/resource.rc
@@ -42,8 +42,7 @@ EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL         "Visit official Miranda NG website",IDC_BTN_HELP,
-                    "Hyperlink",WS_TABSTOP,15,180,338,9
-    CONTROL         "Switch to classic options",IDC_BTN_CLASSICOPT,"Hyperlink",WS_TABSTOP,15,195,338,9
+                    "Hyperlink",WS_TABSTOP,15,195,338,9
     CONTROL         "Custom1",IDC_BTN_ACCOUNTS,"MirandaDescButtonClass",0x0,15,0,160,41
     CONTROL         "Custom1",IDC_BTN_PLUGINS,"MirandaDescButtonClass",0x0,193,135,160,41
     CONTROL         "Custom1",IDC_BTN_IGNORE,"MirandaDescButtonClass",0x0,193,0,160,41
@@ -74,7 +73,7 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,215,265,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,271,265,50,14
     PUSHBUTTON      "Apply",IDC_BTN_APPLY,325,265,50,14,WS_DISABLED
-    CONTROL         "View help online",IDC_BTN_HELP,"Hyperlink",WS_TABSTOP,7,269,118,9
+    CONTROL         "Switch to classic options",IDC_BTN_CLASSICOPT,"Hyperlink",WS_TABSTOP,7,269,118,9
     PUSHBUTTON      "Advanced",IDC_BTN_EXPERT,146,265,64,14,NOT WS_VISIBLE
 END
 
diff --git a/plugins/ModernOpt/src/modernopt.cpp b/plugins/ModernOpt/src/modernopt.cpp
index 3c616bbcc2..670324c6a0 100644
--- a/plugins/ModernOpt/src/modernopt.cpp
+++ b/plugins/ModernOpt/src/modernopt.cpp
@@ -245,6 +245,16 @@ static INT_PTR CALLBACK ModernOptDlgProc(HWND hwndDlg, UINT  msg, WPARAM wParam,
 			}
 			break;
 
+		case IDC_BTN_CLASSICOPT:
+			PostMessage(hwndDlg, WM_CLOSE, 0, 0);
+			// TODO: Set advanced options as default (add db key + check that for opening new options)
+			{
+				OPENOPTIONSDIALOG ood = {0};
+				ood.cbSize = sizeof(ood);
+				Options_Open(&ood);
+			}
+			break;
+
 		case IDC_BTN_HELP:
 			{
 				struct ModernOptionsObject *obj = (struct ModernOptionsObject *)dat->pObjectList[dat->iPage];
@@ -610,7 +620,7 @@ static int hookModernOpt_Initialize(WPARAM wParam, LPARAM lParam)
 	obj.iType = MODERNOPT_TYPE_SECTIONPAGE;
 	obj.lpzTemplate = MAKEINTRESOURCEA(IDD_MODERNOPT_HOME);
 	obj.pfnDlgProc = ModernOptHome_DlgProc;
-	obj.lpzHelpUrl = "http://wiki.miranda-im.org/";
+	obj.lpzHelpUrl = "http://wiki.miranda-ng.org/";
 	CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);
 
 	#if defined(_DEBUG) && defined(MOPT_SAMPLE_PAGES)
diff --git a/plugins/ModernOpt/src/mopt_home.cpp b/plugins/ModernOpt/src/mopt_home.cpp
index 214a0d664b..d76d03e7ca 100644
--- a/plugins/ModernOpt/src/mopt_home.cpp
+++ b/plugins/ModernOpt/src/mopt_home.cpp
@@ -52,15 +52,6 @@ INT_PTR CALLBACK ModernOptHome_DlgProc(HWND hwndDlg, UINT  msg, WPARAM wParam, L
 
 	case WM_COMMAND:
 		switch ( LOWORD(wParam)) {
-		case IDC_BTN_CLASSICOPT:
-			PostMessage(GetParent(hwndDlg), WM_CLOSE, 0, 0);
-			{
-				OPENOPTIONSDIALOG ood = {0};
-				ood.cbSize = sizeof(ood);
-				Options_Open(&ood);
-			}
-			break;
-
 		case IDC_BTN_HELP:
 			ShellExecuteA(hwndDlg, "open", "http://miranda-ng.org/", "", "", SW_SHOW);
 			break;