wait_for_login() related update

Redhat ID: 1080834