Fixed name field prepopulation issue