ref #10461 try fix duplicate username handling (cont. II)