diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in
index 1ef5634af0..bc80acfbc4 100644
--- a/cmake/modules/NSIS.template.in
+++ b/cmake/modules/NSIS.template.in
@@ -246,11 +246,7 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}"
 ##############################################################################
 
 Function LaunchApplication
-   ${UAC.CallFunctionAsUser} LaunchApplicationAsUser
-FunctionEnd
-
-Function LaunchApplicationAsUser
-   Exec "$INSTDIR\${APPLICATION_EXECUTABLE}"
+   !insertmacro UAC_AsUser_ExecShell "" "$INSTDIR\${APPLICATION_EXECUTABLE}" "" "" ""
 FunctionEnd
 
 ##############################################################################
@@ -365,7 +361,6 @@ Function PageLeaveReinstall
       RMDir $INSTDIR
    no_remove_uninstaller:
       StrCmp $R0 "2" 0 +3
-      UAC::Unload
       Quit
       BringToFront
    reinst_done:
@@ -725,7 +720,7 @@ Function .onInit
    ${MementoSectionRestore}
 
    UAC_Elevate:
-      UAC::RunElevated
+      !insertmacro UAC_RunElevated
       StrCmp 1223 $0 UAC_ElevationAborted ; UAC dialog aborted by user?
       StrCmp 0 $0 0 UAC_Err ; Error?
       StrCmp 1 $1 0 UAC_Success ;Are we the real deal or just the wrapper?
@@ -773,11 +768,9 @@ Function .onInstSuccess
    ${AndIf} $InstallRunIfSilent == "yes"
      Call LaunchApplication
    ${EndIf}
-   UAC::Unload ;Must call unload!
 FunctionEnd
 
 Function .onInstFailed
-   UAC::Unload ;Must call unload!
 FunctionEnd
 
 ##############################################################################
@@ -790,7 +783,7 @@ Function un.onInit
    Call un.SetLang
 
    UAC_Elevate:
-      UAC::RunElevated
+      !insertmacro UAC_RunElevated
       StrCmp 1223 $0 UAC_ElevationAborted ; UAC dialog aborted by user?
       StrCmp 0 $0 0 UAC_Err ; Error?
       StrCmp 1 $1 0 UAC_Success ;Are we the real deal or just the wrapper?
@@ -821,9 +814,7 @@ Function un.onInit
 FunctionEnd
 
 Function un.onUnInstSuccess
-   UAC::Unload ;Must call unload!
 FunctionEnd
 
 Function un.onUnInstFailed
-   UAC::Unload ;Must call unload!
 FunctionEnd