diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index 8bc8d070..86bf16da 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -254,35 +254,35 @@ Var MUI_TEMP2
 
 !macroend
 
-!macro MUI_FINISHHEADER
+!macro MUI_ENDHEADER
 
-  IfAbort mui.finishheader_abort
+  IfAbort mui.endheader_abort
   
-    !ifdef MUI_INSTFILESPAGE_FINISHHEADER_TEXT
-      !ifdef MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT
-        !insertmacro MUI_HEADER_TEXT "${MUI_INSTFILESPAGE_FINISHHEADER_TEXT}" "${MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT}"
-      !else
-        !insertmacro MUI_HEADER_TEXT "${MUI_INSTFILESPAGE_FINISHHEADER_TEXT}" "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_FINISH_SUBTITLE)"
-      !endif
+    !ifdef MUI_INSTFILESPAGE_FINISHHEADER_TEXT & MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT
+      !insertmacro MUI_HEADER_TEXT "${MUI_INSTFILESPAGE_FINISHHEADER_TEXT}" "${MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT}"
+    !else ifdef MUI_INSTFILESPAGE_FINISHHEADER_TEXT
+      !insertmacro MUI_HEADER_TEXT "${MUI_INSTFILESPAGE_FINISHHEADER_TEXT}" "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_FINISH_SUBTITLE)"
+    !else ifdef MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT
+      !insertmacro MUI_HEADER_TEXT "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_FINISH_TITLE)" "${MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT}"
     !else
       !insertmacro MUI_HEADER_TEXT "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_FINISH_TITLE)" "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_FINISH_SUBTITLE)"
     !endif
   
-  Goto mui.finishheader_done
+  Goto mui.endheader_done
   
-  mui.finishheader_abort:
+  mui.endheader_abort:
   
-  !ifdef MUI_INSTFILESPAGE_ABORTHEADER_TEXT
-    !ifdef MUI_INSTFILESPAGE_ABORTHEADER_SUBTEXT
+    !ifdef MUI_INSTFILESPAGE_ABORTHEADER_TEXT & MUI_INSTFILESPAGE_ABORTHEADER_SUBTEXT
       !insertmacro MUI_HEADER_TEXT "${MUI_INSTFILESPAGE_ABORTHEADER_TEXT}" "${MUI_INSTFILESPAGE_ABORTHEADER_SUBTEXT}"
-    !else
+    !else ifdef MUI_INSTFILESPAGE_ABORTHEADER_TEXT
       !insertmacro MUI_HEADER_TEXT "${MUI_INSTFILESPAGE_ABORTHEADER_TEXT}" "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_ABORT_SUBTITLE)"
+    !else ifdef MUI_INSTFILESPAGE_ABORTHEADER_SUBTEXT
+      !insertmacro MUI_HEADER_TEXT "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_ABORT_TITLE)" "${MUI_INSTFILESPAGE_ABORTHEADER_SUBTEXT}"
+    !else
+      !insertmacro MUI_HEADER_TEXT "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_ABORT_TITLE)" "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_ABORT_SUBTITLE)"
     !endif
-  !else
-    !insertmacro MUI_HEADER_TEXT "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_ABORT_TITLE)" "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_ABORT_SUBTITLE)"
-  !endif
   
-  mui.finishheader_done:
+  mui.endheader_done:
 
 !macroend
 
@@ -1337,7 +1337,7 @@ Var MUI_TEMP2
     
     !insertmacro MUI_PAGE_FUNCTION_CUSTOM LEAVE
       
-    !insertmacro MUI_FINISHHEADER
+    !insertmacro MUI_ENDHEADER
     !ifndef MUI_PAGE_UNINSTALLER
       !insertmacro MUI_LANGDLL_SAVELANGUAGE
     !endif