Bugfix/fb email failures