wait_for_login() related update

Redhat ID: 1080834



Need to check witch one is common in our testing.