Wrap long login status
Merge remote-tracking branch 'chiiph/bug/long_login_status' into develop