That won’t fix it. Although now that you mention it, that PR probably introduced this behaviour change.
Some context: we removed an old ‘omit username’ flag from core, which the LDAP plugin was using. It was extremely similar to the overrides_username setting, which is why I simply substituted them in the LDAP plugin. However, as you’ve noticed, omit_username only applied during initial signup, while overrides_username applies on every login.
Here’s a PR to reverse that behaviour change. We’ll need @jonmbake to merge