diff --git a/test/quota/DQTC.BAT b/test/quota/DQTC.BAT
index 265c155..e2b6dae 100644
--- a/test/quota/DQTC.BAT
+++ b/test/quota/DQTC.BAT
@@ -18,7 +18,7 @@ ECHO. >> C:\DQTTMP\HELPER.TXT
 ECHO DQTC wartet jetzt auf den Linux-Teil.
 ECHO Linux: quota fuer NOPASSUSER auf 12x4K setzen.
 ECHO Danach hier J, j, Y oder y druecken.
-C:\DQTTMP\TESTS WAITJY > C:\DQTTMP\WAIT.OUT
+C:\DQTTMP\TESTS WAITJY
 IF ERRORLEVEL 1 GOTO ABORT
 
 ECHO === LOGOUT from supervisor session === >> C:\DQTTMP\HELPER.TXT
@@ -96,31 +96,20 @@ GOTO END
 
 :RELSUP
 TYPE C:\DQTTMP\WRITE.LOG
-IF "%LGNTPWD%"=="" GOTO MANUAL
+IF EXIST C:\DQTTMP\DQTREL.BAT GOTO AUTOREL
+GOTO MANUAL
 
+:AUTOREL
 ECHO === LOGOUT NOPASSUSER === >> C:\DQTTMP\HELPER.TXT
 C:\DQTTMP\LOGOUT > C:\DQTTMP\D03_LOGOUT_USER.OUT
 
-ECHO === LOGIN SUPERVISOR === >> C:\DQTTMP\HELPER.TXT
-C:\DQTTMP\LOGIN SUPERVISOR /PWD:%LGNTPWD% > C:\DQTTMP\D04_LOGIN_SUP.OUT
-
-F:
-CD \
-IF EXIST DQTSTA.BAT GOTO QUEUEP2
-ECHO F:\DQTSTA.BAT missing after supervisor relogin. >> C:\DQTTMP\HELPER.TXT
-ECHO Bitte manuell als SUPERVISOR einloggen und F:\DQTSTA PART2 starten.
-GOTO END
-
-:QUEUEP2
-C:
-CD \DQTTMP
-DLYSTRT /T:2 F:\DQTSTA.BAT PART2 > C:\DQTTMP\D05_P2.OUT
-ECHO DQTC queued F:\DQTSTA.BAT PART2. >> C:\DQTTMP\HELPER.TXT
-ECHO DQTC fertig. PART2 wird per DLYSTRT gestartet.
+ECHO === QUEUE SUPERVISOR RELOGIN HELPER === >> C:\DQTTMP\HELPER.TXT
+C:\DQTTMP\DLYSTRT /T:2 DQTREL.BAT > C:\DQTTMP\D03_RELQUEUE.OUT
+ECHO DQTC fertig. SUPERVISOR relogin und PART2 wurden per DLYSTRT gestartet.
 GOTO END
 
 :MANUAL
-ECHO LGNTPWD not set; automatic SUPERVISOR relogin skipped. >> C:\DQTTMP\HELPER.TXT
+ECHO C:\DQTTMP\DQTREL.BAT missing; automatic SUPERVISOR relogin skipped. >> C:\DQTTMP\HELPER.TXT
 ECHO Bitte manuell als SUPERVISOR einloggen und dann ausfuehren:
 ECHO   F:
 ECHO   DQTSTA PART2
diff --git a/test/quota/DQTSTA.BAT b/test/quota/DQTSTA.BAT
index b55570b..fbf8e04 100644
--- a/test/quota/DQTSTA.BAT
+++ b/test/quota/DQTSTA.BAT
@@ -100,6 +100,29 @@ ECHO ERROR: C:\DQTTMP\LOGOUT.EXE not copied.
 GOTO END
 :HVLOGOUT
 
+IF "%LGNTPWD%"=="" GOTO SKIPREL
+ECHO Creating local supervisor relogin helper. >> F:\DQTCMP\RUN.LOG
+ECHO @ECHO OFF> C:\DQTTMP\DQTREL.BAT
+ECHO REM Generated by DQTSTA. Logs back in as SUPERVISOR and queues PART2.>> C:\DQTTMP\DQTREL.BAT
+ECHO C:>> C:\DQTTMP\DQTREL.BAT
+ECHO CD \DQTTMP>> C:\DQTTMP\DQTREL.BAT
+ECHO C:\DQTTMP\LOGIN SUPERVISOR /PWD:%LGNTPWD% ^> C:\DQTTMP\D04_LOGIN_SUP.OUT>> C:\DQTTMP\DQTREL.BAT
+ECHO F:>> C:\DQTTMP\DQTREL.BAT
+ECHO CD \>> C:\DQTTMP\DQTREL.BAT
+ECHO IF EXIST DQTSTA.BAT GOTO QUEUEP2>> C:\DQTTMP\DQTREL.BAT
+ECHO ECHO F:\DQTSTA.BAT missing after supervisor relogin. ^>^> C:\DQTTMP\HELPER.TXT>> C:\DQTTMP\DQTREL.BAT
+ECHO GOTO END>> C:\DQTTMP\DQTREL.BAT
+ECHO :QUEUEP2>> C:\DQTTMP\DQTREL.BAT
+ECHO C:>> C:\DQTTMP\DQTREL.BAT
+ECHO CD \DQTTMP>> C:\DQTTMP\DQTREL.BAT
+ECHO C:\DQTTMP\DLYSTRT /T:2 F:\DQTSTA.BAT PART2 ^> C:\DQTTMP\D05_P2.OUT>> C:\DQTTMP\DQTREL.BAT
+ECHO ECHO DQTREL queued F:\DQTSTA.BAT PART2. ^>^> C:\DQTTMP\HELPER.TXT>> C:\DQTTMP\DQTREL.BAT
+ECHO :END>> C:\DQTTMP\DQTREL.BAT
+GOTO RELREADY
+:SKIPREL
+ECHO LGNTPWD is not set; automatic supervisor relogin helper was not generated. >> F:\DQTCMP\RUN.LOG
+:RELREADY
+
 C:
 CD \DQTTMP
 DLYSTRT /T:2 DQTC.BAT >> F:\DQTCMP\RUN.LOG