handle login window error #79828
Merge pull request #124 from alediator/8.5-SNAPSHOT-login-window-fix-79828

handle login window error #79828