Fix up account_autocreate logic

Change-Id: Icce955a5e9f6a77fb0a401685452f26d24c9392d
Merge "Fix up account_autocreate logic"