diff --git a/src/auth/send.rs b/src/auth/send.rs
index f42cb7d0..c293e01e 100644
--- a/src/auth/send.rs
+++ b/src/auth/send.rs
@@ -80,7 +80,7 @@ impl SendTokens {
             return Self::invalid_error(&format!("Can't convert {access_id}"), "send_id_invalid", false);
         };
 
-        let Some((mut send, o_otp)) = SendOTP::find_with_send(&send_id, email.as_ref(), conn).await else {
+        let Some((send, o_otp)) = SendOTP::find_with_send(&send_id, email.as_ref(), conn).await else {
             return Self::invalid_error(&format!("Can't find {send_id}"), "send_id_invalid", false);
         };
 
@@ -106,16 +106,28 @@ impl SendTokens {
             let now = Utc::now().naive_utc();
             match email.as_ref() {
                 Some(e) if split.any(|s| s == e) => {
-                    match (otp, o_otp) {
-                        (Some(code), Some(db_otp)) if crypto::ct_eq(&code, &db_otp.code) && now < db_otp.expiration_date => (),
-                        (None, _) => {
+                    if let Some(code) = otp {
+                        if let Some(db_otp) = o_otp {
+                            if crypto::ct_eq(&code, &db_otp.code) && now < db_otp.expiration_date {
+                                db_otp.delete(conn).await?;
+                            } else {
+                                return Self::expected_error("Email OTP required", "email_and_otp_required");
+                            }
+                        } else {
+                            return Self::invalid_error(&format!("Send {send_id}, disabled"), "send_id_invalid", true);
+                        }
+                    } else {
+                        if let Some(db_otp) = o_otp
+                            && now + TimeDelta::try_minutes(1).unwrap() < db_otp.expiration_date
+                        {
+                            // Code is still valid for a minute do nothing
+                        } else {
                             // SEND OTP CODE
                             let code = crypto::generate_email_token(CONFIG.email_token_size());
                             SendOTP::new(send_id, e, code.clone()).save(conn).await?;
                             mail::send_sends_otp(e, &code).await?;
-                            return Self::expected_error("Email OTP required", "email_and_otp_required");
                         }
-                        _ => return Self::invalid_error(&format!("Send {send_id}, disabled"), "send_id_invalid", true),
+                        return Self::expected_error("Email OTP required", "email_and_otp_required");
                     }
                 }
                 Some(e) => {
diff --git a/src/db/models/send.rs b/src/db/models/send.rs
index 7b29a9c3..b27a7650 100644
--- a/src/db/models/send.rs
+++ b/src/db/models/send.rs
@@ -462,6 +462,15 @@ impl SendOTP {
         }
     }
 
+    pub async fn delete(&self, conn: &DbConn) -> EmptyResult {
+        conn.run(move |conn| {
+            diesel::delete(sends_otp::table.filter(sends_otp::send_uuid.eq(&self.send_uuid)))
+                .execute(conn)
+                .map_res("Error deleting send_otp")
+        })
+        .await
+    }
+
     pub async fn find_with_send(uuid: &SendId, email: Option<&String>, conn: &DbConn) -> Option<(Send, Option<Self>)> {
         if let Some(mail) = email.map(|e| e.to_lowercase()) {
             conn.run(move |conn| {