diff --git a/scripts/cleanup-tiles.cmd b/scripts/cleanup-tiles.cmd
new file mode 100644
index 0000000..d22f378
--- /dev/null
+++ b/scripts/cleanup-tiles.cmd
@@ -0,0 +1,12 @@
+@echo off
+set TOOLS=c:\tools
+
+net session >nul 2>&1
+if NOT %ERRORLEVEL% == 0 ( 
+  echo ERROR: User has NO ADMINISTRATOR rights!
+  exit /b  
+)
+
+echo cleaning START menu tiles ...
+powershell -command %TOOLS%\scripts\cleanup-tiles.ps1
+
diff --git a/tools/logon.cmd b/tools/logon.cmd
index a0a82a1..b4dcd80 100644
--- a/tools/logon.cmd
+++ b/tools/logon.cmd
@@ -224,8 +224,8 @@ reg add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer" ^
 echo disabling unwanted NETWORK features ...
 powershell -command %TOOLS%\scripts\disable-networkfeatures.ps1
 
-echo cleaning START menu tiles ...
-powershell -command %TOOLS%\scripts\cleanup-tiles.ps1
+rem try to cleanup the tiles in the start menu (only for admins)
+call %TOOLS%\scripts\cleanup-tiles.cmd
 
 rem create a statusfile (this codeblock must be executed only once per user) ...
 echo 1 >%USERCONFIG_DONE%