Fixes to match new field names
Merge branch 'master' of https://github.com/WST/jabberid-web