login sometimes takes >5s to complete

Change-Id: Ia388ed92b7c8cf6fea12fe821938948ea92ca7a1