fixed username stuff