Revert "Revert "refs #33297""
Merge pull request #502 from aipocom/revert-485-revert-480-bugfix/password-alert

Revert "Revert "refs #33297""