diff --git a/tools/logon.cmd b/tools/logon.cmd
index 0be8e11..9ff154b 100644
--- a/tools/logon.cmd
+++ b/tools/logon.cmd
@@ -129,15 +129,24 @@ echo.
 if %emclient_license% == 0 (
   echo no em Client license found!
 ) else (
-  echo 
-  echo adding em Client license ...
-  "%ProgramFiles(x86)%\eM Client\MailClient.exe" /activate %emclient_license%
+  echo.
+  if EXIST "%ProgramFiles(x86)%\eM Client\MailClient.exe" (
+    echo adding em Client license ...
+    "%ProgramFiles(x86)%\eM Client\MailClient.exe" /activate %emclient_license%
+
+    rem create a statusfile (this block must be executed only once) ...
+    echo 1 >%EMLICENSE_DONE%
+
+  ) else (
+    echo em Client is NOT installed!
+  )
   echo.
 )
 
-rem create a statusfile (this block must be executed only once) ...
-echo 1 >%EMLICENSE_DONE%
 
+rem ###
+rem ### USERCONFIG (this part must be excuted only ONCE PER USER)
+rem ###
 
 :USERCONFIG