Merge branch 'fix-email-on-client-edit'
fix:  can't edit clients
Merge branch 'master' into develop