Remove overwrite of username