User block/unlock bugfix for users with faked email

Embed sending mail into try-catch block
Merge branch 'v2.1'
Merge branch 'master' of github.com:cc1-cloud/cc1