This is unfortunately not as straightforward, as the split includes the important piece of ignoring username rules when changing password. Without it any previously added user whose username doesn't match current policy would be unable to change password.