diff --git a/src/WindowsInstaller/Settings.nsh b/src/WindowsInstaller/Settings.nsh
index 9c38df1513..dbd2411938 100644
--- a/src/WindowsInstaller/Settings.nsh
+++ b/src/WindowsInstaller/Settings.nsh
@@ -25,7 +25,7 @@ SetCompressor /SOLID lzma
 
 !define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}" # Version to display
 
-!define COPYRIGHT_YEAR 2019
+!define COPYRIGHT_YEAR 2020
 
 #--------------------------------
 # Installer file name
diff --git a/src/WindowsInstaller/include/init.nsh b/src/WindowsInstaller/include/init.nsh
index c6b5a534ca..af385577cd 100644
--- a/src/WindowsInstaller/include/init.nsh
+++ b/src/WindowsInstaller/include/init.nsh
@@ -161,11 +161,14 @@ Function un.onInit
   !insertmacro MULTIUSER_UNINIT
 
   # Check that FreeCAD is not currently running
-  FindProcDLL::FindProc "${BIN_FREECAD}"
-  ${if} $R0 == "1"
+  ${nsProcess::FindProcess} ${BIN_FREECAD} $R0
+  # if running result is '0', if not running it is '603'
+  ${if} $R0 == "0"
    MessageBox MB_OK|MB_ICONSTOP "$(UnInstallRunning)" /SD IDOK
    Abort
   ${endif}
+  # plugin must be unloaded
+  ${nsProcess::Unload}
   
   # check if it is a 64bit system
   ${if} ${RunningX64}
diff --git a/src/WindowsInstaller/setup/configure.nsh b/src/WindowsInstaller/setup/configure.nsh
index 70d9a900c8..dae07512f0 100644
--- a/src/WindowsInstaller/setup/configure.nsh
+++ b/src/WindowsInstaller/setup/configure.nsh
@@ -43,7 +43,7 @@ Section -InstallData
   
   WriteRegStr SHCTX ${APP_UNINST_KEY} "UninstallString" '"$INSTDIR\${SETUP_UNINSTALLER}"'
   WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayVersion" "${APP_VERSION}"
-  WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayIcon" "$INSTDIR\bin\${APP_NAME}.exe"
+  WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayIcon" "$INSTDIR\${APP_RUN}"
   WriteRegStr SHCTX ${APP_UNINST_KEY} "URLUpdateInfo" "${APP_WEBPAGE}"
   WriteRegStr SHCTX ${APP_UNINST_KEY} "URLInfoAbout" "https://www.freecadweb.org/"
   WriteRegStr SHCTX ${APP_UNINST_KEY} "Publisher" "${APP_NAME} Team"