Fix for shell login dialog on windows
Windows merge