Username fix and new change