I'm not sure how easy this would be to implement, but a more fine-tuned approach would come in handy, I think: being able to lock mail, name and avatar independently of each other. That way, each organisation could set those up as needed.
Funny that you mentioned OIDC — that's actually how we found out: users had missing pictures in another app and weren't able to change there Avatars on their profiles.