Edited salutation field, musst be set
Merge branch 'feature/166' into develop