fixed username replacement