diff --git a/getAutoLogonPassword.bat b/getAutoLogonPassword.bat
index 4561e93..3aff732 100755
--- a/getAutoLogonPassword.bat
+++ b/getAutoLogonPassword.bat
@@ -4,11 +4,13 @@
 
 pushd %~dp0
 
-for /f "delims=" %%a in ('getRegValue.bat "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" DefaultUserName short') do @set user=%%a
+set REGISTRY="HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon"
 
-for /f "delims=" %%a in ('getRegValue.bat "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" DefaultPassword short') do @set password=%%a
+for /f "delims=" %%a in ('getRegValue.bat %REGISTRY% DefaultUserName short') do @set user=%%a
 
-echo AutoLogon: %user%@%password%
+for /f "delims=" %%a in ('getRegValue.bat %REGISTRY% DefaultPassword short') do @set password=%%a
+
+echo AutoLogon: %user%:%password%
 
 popd