wait_for_login() related update

Redhat ID: 1080834



That's enough for me. :+1: 

Thanks,
Xu