This PR adds test cases for the problem described in the OP, so we can be sure that in general overriding username, for example, from jb1 to jb works:
jb1
jb
I’m going to take a look at it.