Fixed emails not getting created