Fix Account Creation not working

Change-Id: I8a9bbf3e63086fb016121552b57e1210ac6d821c