Fixing and re adding User Name field