bugfix for users without mailaddress
Merge branch 'master' into jupis