Temporary fix of double emails bug with spinner.
This hasn't fixed root cause of the problem however...