Properly adding username as sender

and over-write dud commit