diff --git a/ExplorerPatcher/dllmain.c b/ExplorerPatcher/dllmain.c
index 285012b..647ea4d 100644
--- a/ExplorerPatcher/dllmain.c
+++ b/ExplorerPatcher/dllmain.c
@@ -3895,7 +3895,7 @@ void WINAPI LoadSettings(BOOL bIsExplorer)
             &dwTemp,
             &dwSize
         );
-        if (dwTemp)
+        if (!IsAppRunningAsAdminMode() && dwTemp)
         {
 #ifdef _WIN64
             LaunchPropertiesGUI(hModule);
diff --git a/ep_setup/ep_setup.c b/ep_setup/ep_setup.c
index 51f7718..a94000e 100644
--- a/ep_setup/ep_setup.c
+++ b/ep_setup/ep_setup.c
@@ -304,33 +304,6 @@ int WINAPI wWinMain(
     WCHAR wszPath[MAX_PATH];
     ZeroMemory(wszPath, MAX_PATH * sizeof(WCHAR));
 
-    if (argc >= 1 && !_wcsicmp(wargv[0], _T(EP_SETUP_HELPER_SWITCH) L"_" _T(EP_CLSID)))
-    {
-        HANDLE hEvent0 = CreateEventW(NULL, FALSE, FALSE, _T(EP_SETUP_HELPER_SWITCH) L"_" _T(EP_CLSID));
-        HANDLE hEvent1 = CreateEventW(NULL, FALSE, FALSE, _T(EP_SETUP_HELPER_SWITCH) L"_" _T(EP_CLSID) L"_1");
-        if (hEvent0 && hEvent1)
-        {
-            SetEvent(hEvent1);
-            CloseHandle(hEvent1);
-            hEvent1 = NULL;
-            WaitForSingleObject(hEvent0, INFINITE);
-            CloseHandle(hEvent0);
-            hEvent0 = NULL;
-            StartExplorerWithDelay(1000);
-        }
-        if (hEvent1)
-        {
-            CloseHandle(hEvent1);
-            hEvent1 = NULL;
-        }
-        if (hEvent0)
-        {
-            CloseHandle(hEvent0);
-            hEvent0 = NULL;
-        }
-        return 0;
-    }
-
     if (argc >= 1 && !_wcsicmp(wargv[0], L"/extract"))
     {
         if (argc >= 2)
@@ -422,22 +395,6 @@ int WINAPI wWinMain(
     {
         bOk = TRUE;
 
-        HANDLE hEvent0 = CreateEventW(NULL, FALSE, FALSE, _T(EP_SETUP_HELPER_SWITCH) L"_" _T(EP_CLSID));
-        HANDLE hEvent1 = CreateEventW(NULL, FALSE, FALSE, _T(EP_SETUP_HELPER_SWITCH) L"_" _T(EP_CLSID) L"_1");
-        HRESULT hr = CoInitialize(NULL);
-        if (SUCCEEDED(hr))
-        {
-            if (hEvent0 && hEvent1)
-            {
-                hr = ShellExecuteFromExplorer(wszOwnPath, _T(EP_SETUP_HELPER_SWITCH) L"_" _T(EP_CLSID), NULL, NULL, SW_SHOWNORMAL);
-                if (SUCCEEDED(hr))
-                {
-                    WaitForSingleObject(hEvent1, INFINITE);
-                }
-            }
-            CoUninitialize();
-        }
-
         HWND hShellTrayWnd = FindWindowW(L"Shell_TrayWnd", NULL);
         if (hShellTrayWnd)
         {
@@ -717,39 +674,7 @@ int WINAPI wWinMain(
             );
         }
 
-        if (!hEvent0 || !hEvent1 || FAILED(hr))
-        {
-            if (!hShellTrayWnd)
-            {
-                if (bOk)
-                {
-                    MessageBoxW(
-                        NULL,
-                        L"" _T(PRODUCT_NAME) L" has been installed successfully. Start File Explorer to have it load up.",
-                        _T(PRODUCT_NAME),
-                        MB_ICONINFORMATION | MB_OK | MB_DEFBUTTON1
-                    );
-                }
-            }
-            else
-            {
-                StartExplorerWithDelay(1000);
-            }
-        }
-        else
-        {
-            SetEvent(hEvent0);
-        }
-        if (hEvent1)
-        {
-            CloseHandle(hEvent1);
-            hEvent1 = NULL;
-        }
-        if (hEvent0)
-        {
-            CloseHandle(hEvent0);
-            hEvent0 = NULL;
-        }
+        StartExplorerWithDelay(1000);
     }
 
 	return GetLastError();