Fix for onboarding login lockup.

Change-Id: I84ed09467e07b78913b618cea6a1485443719872