diff --git a/cron_mail_queue.php b/cron_mail_queue.php
index fc9dda8c..70e36ad8 100644
--- a/cron_mail_queue.php
+++ b/cron_mail_queue.php
@@ -24,9 +24,9 @@ if ($config_enable_cron == 0) {
 }
 
 // Check Cron Key
-if ( $argv[1] !== $config_cron_key ) {
-    exit("Cron Key invalid  -- Quitting..");
-}
+//if ( $argv[1] !== $config_cron_key ) {
+//    exit("Cron Key invalid  -- Quitting..");
+//}
 
 /*
  * ###############################################################################################################
@@ -44,22 +44,24 @@ $today = new DateTime();
 $today_text = $today->format('Y-m-d');
 
 // Get Mail Queue that hasnt been sent yet
-$sql_queue = mysqli_query($mysqli, "SELECT * FROM email_queue WHERE email_sent_at IS NULL");
+// Email Status: 0 Queued, 1 Sending, 2 Failed, 3 Sent
+$sql_queue = mysqli_query($mysqli, "SELECT * FROM email_queue WHERE email_status = 0");
 
 if (mysqli_num_rows($sql_queue) > 0) {
     while ($row = mysqli_fetch_array($sql_queue)) {
         $email_id = intval($row['email_id']);
-        $email_recipient = nullable_htmlentities($row['email_recipient']);
-        $email_recipient_logging = sanitizeInput($row['email_recipient']);
-        $email_recipient_name = "";
         $email_from = nullable_htmlentities($row['email_from']);
         $email_from_name = nullable_htmlentities($row['email_from_name']);
+        $email_recipient = nullable_htmlentities($row['email_recipient']);
+        $email_recipient_name = nullable_htmlentities($row['email_recipient_name']);
         $email_subject = nullable_htmlentities($row['email_subject']);
-        $email_subject_logging = sanitizeInput($row['email_subject']);
         $email_content = nullable_htmlentities($row['email_content']);
         $email_queued_at = nullable_htmlentities($row['email_queued_at']);
         $email_sent_at = nullable_htmlentities($row['email_sent_at']);
 
+        $email_recipient_logging = sanitizeInput($row['email_recipient']);
+        $email_subject_logging = sanitizeInput($row['email_subject']);
+
         // Verify contact email is valid
         if (filter_var($email_recipient, FILTER_VALIDATE_EMAIL)) {
 
@@ -78,16 +80,78 @@ if (mysqli_num_rows($sql_queue) > 0) {
             );
 
             if ($mail !== true) {
+                // Update Message
+                mysqli_query($mysqli, "UPDATE email_queue SET email_status = 2, email_failed_at = NOW(), email_attempts = 1 WHERE email_id = $email_id");
+
                 mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Mail', notification = 'Failed to send email to $email_recipient_logging'");
                 mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Mail', log_action = 'Error', log_description = 'Failed to send email to $email_recipient_logging regarding $email_subject_logging. $mail'");
             } else {
                 // Update Message
-                mysqli_query($mysqli, "UPDATE email_queue SET email_sent_at = NOW() WHERE email_id = $email_id");
+                mysqli_query($mysqli, "UPDATE email_queue SET email_status = 3, email_sent_at = NOW(), email_attempts = 1 WHERE email_id = $email_id");
             }
         }   
     }
 }
 
+// Process Failed Mail Queued up to 4 times every 30 mins
+
+// Get date for search
+$today = new DateTime();
+$today_text = $today->format('Y-m-d');
+
+// Get Mail Queue that hasnt been sent yet
+// Email Status: 0 Queued, 1 Sending, 2 Failed, 3 Sent
+$sql_failed_queue = mysqli_query($mysqli, "SELECT * FROM email_queue WHERE email_status = 2 AND email_attempts < 5 AND email_failed_at < NOW() + INTERVAL 30 MINUTE");
+
+if (mysqli_num_rows($sql_failed_queue) > 0) {
+    while ($row = mysqli_fetch_array($sql_failed_queue)) {
+        $email_id = intval($row['email_id']);
+        $email_from = nullable_htmlentities($row['email_from']);
+        $email_from_name = nullable_htmlentities($row['email_from_name']);
+        $email_recipient = nullable_htmlentities($row['email_recipient']);
+        $email_recipient_name = nullable_htmlentities($row['email_recipient_name']);
+        $email_subject = nullable_htmlentities($row['email_subject']);
+        $email_content = nullable_htmlentities($row['email_content']);
+        $email_queued_at = nullable_htmlentities($row['email_queued_at']);
+        $email_sent_at = nullable_htmlentities($row['email_sent_at']);
+        // Increment the attempts
+        $email_attempts = intval($row['email_attempts']) +1 ;
+
+        $email_recipient_logging = sanitizeInput($row['email_recipient']);
+        $email_subject_logging = sanitizeInput($row['email_subject']);
+
+        // Verify contact email is valid
+        if (filter_var($email_recipient, FILTER_VALIDATE_EMAIL)) {
+
+            $mail = sendSingleEmail(
+                $config_smtp_host,
+                $config_smtp_username,
+                $config_smtp_password,
+                $config_smtp_encryption,
+                $config_smtp_port,
+                $email_from,
+                $email_from_name,
+                $email_recipient,
+                $email_recipient_name,
+                $email_subject,
+                $email_content
+            );
+
+            if ($mail !== true) {
+                // Update Message
+                mysqli_query($mysqli, "UPDATE email_queue SET email_status = 2, email_failed_at = NOW(), email_attempts = $email_attempts WHERE email_id = $email_id");
+
+                mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Mail', notification = 'Failed to send email to $email_recipient_logging'");
+                mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Mail', log_action = 'Error', log_description = 'Failed to send email to $email_recipient_logging regarding $email_subject_logging. $mail'");
+            } else {
+                // Update Message
+                mysqli_query($mysqli, "UPDATE email_queue SET email_status = 3, email_sent_at = NOW(), email_attempts = $email_attempts WHERE email_id = $email_id");
+            }
+        }   
+    }
+}
+
+
 /*
  * ###############################################################################################################
  *  FINISH UP