Revert "Fix disabled status after sending the email"

This reverts commit 5f6970ffc51f560f332f275b9edac65f4ef2c1c5.
Fix space, date being sent and extra space