Little fixes - Username updates