Fixes #6424 for both edit and view contact pages