make contact modal behave properly (after setup)
Merge remote-tracking branch 'origin/master'