It was mostly matter of preparing the code when we get rid of the `username` field, but I can totally remove this as it's not necessary for the patch to work.