Check in create-user changes from megacz