diff --git a/tools/setup-thinclient.cmd b/tools/setup-thinclient.cmd
index 8f85646..95b92d1 100644
--- a/tools/setup-thinclient.cmd
+++ b/tools/setup-thinclient.cmd
@@ -9,7 +9,10 @@ reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" ^
   /v Shell /t REG_SZ /d "%TOOLS%\thinclient.exe" /f 2>/nul
 
 echo Creating user %THINUSER% ...
-net user %THINUSER% "" /ADD
+net user %THINUSER% /passwordreq:no /passwordchg:no /ADD
+
+echo Setting password expire date of user %THINUSER% to NEVER ...
+WMIC USERACCOUNT WHERE Name='%THINUSER%' SET PasswordExpires=FALSE
 
 echo Disabling Lockscreen function ...
 reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" ^