Merge remote-tracking branch 'upstream/dashboard' into dashboard
 fixed email if statment