diff --git a/template/components/email.ejs b/template/components/email.ejs
index 740e9c6..07ef3cb 100644
--- a/template/components/email.ejs
+++ b/template/components/email.ejs
@@ -5,7 +5,7 @@
         <div class="absolute inset-0 overflow-hidden">
             <div class="pointer-events-none fixed inset-y-0 right-0 flex max-w-full pl-10 sm:pl-16">
                 <div class="pointer-events-auto w-screen max-w-md">
-                    <form id="voucher-forum" class="flex h-full flex-col divide-y divide-black/5 dark:divide-white/25 bg-white dark:bg-gray-900 shadow-xl" action="<%= baseUrl %>/voucher/<%= voucher._id %>/email" method="post" enctype="multipart/form-data">
+                    <form id="email-forum" class="flex h-full flex-col divide-y divide-black/5 dark:divide-white/25 bg-white dark:bg-gray-900 shadow-xl" action="<%= baseUrl %>/voucher/<%= voucher._id %>/email" method="post" enctype="multipart/form-data">
                         <div class="h-0 flex-1 overflow-y-auto">
                             <div class="bg-sky-700 px-4 py-6 sm:px-6">
                                 <div class="flex items-center justify-between">
diff --git a/template/voucher.ejs b/template/voucher.ejs
index 35c148c..7c398bb 100644
--- a/template/voucher.ejs
+++ b/template/voucher.ejs
@@ -296,7 +296,7 @@
                                 </div>
                                 <div class="flex flex-shrink-0 justify-end px-4 py-4">
                                     <button id="cancel" type="button" class="rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50">Cancel</button>
-                                    <button type="submit" class="ml-4 inline-flex justify-center rounded-md bg-sky-700 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-sky-600 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-sky-700">Save</button>
+                                    <button type="submit" class="ml-4 inline-flex justify-center rounded-md bg-sky-700 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-sky-600 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-sky-700">Create</button>
                                 </div>
                             </form>
                         </div>
@@ -338,6 +338,17 @@
             <p class="w-1/2 text-center text-white">This may take a few seconds, please don't close this page.</p>
         </div>
 
+        <div id="spinner-email" style="display: none;" class="fixed top-0 left-0 right-0 bottom-0 w-full h-screen z-50 overflow-hidden bg-gray-900 opacity-90 flex flex-col items-center justify-center">
+            <div class="mb-4">
+                <svg class="w-14 h-14 text-gray-200 animate-spin dark:text-gray-600 fill-cyan-400" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
+                    <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
+                </svg>
+            </div>
+            <h2 class="text-center text-white text-xl font-semibold">Sending Voucher...</h2>
+            <p class="w-1/2 text-center text-white">This may take a few seconds, please don't close this page.</p>
+        </div>
+
         <div aria-live="assertive" class="z-40 pointer-events-none fixed inset-0 flex items-end px-4 py-6">
             <div id="copy-notification" style="display: none;" class="flex w-full flex-col items-center space-y-4">
                 <div class="pointer-events-auto w-full max-w-sm overflow-hidden rounded-lg bg-white dark:bg-gray-800 shadow-lg ring-1 ring-black ring-opacity-5">
@@ -389,6 +400,7 @@
             const spinnerCreate = document.querySelector("#spinner-create");
             const spinnerRemove = document.querySelector("#spinner-remove");
             const spinnerList = document.querySelector("#spinner-list");
+            const spinnerEmail = document.querySelector("#spinner-email");
             const copyNotification = document.querySelector("#copy-notification");
             const vouchers = document.querySelectorAll('.voucher');
             const vouchersEmail = document.querySelectorAll('.voucher-email');
@@ -399,10 +411,15 @@
             };
 
             const clearEmailDialog = () => {
+                document.querySelector('#email-forum').removeEventListener('submit', emailSpinner);
                 document.querySelector('#close').removeEventListener('click', clearEmailDialog);
                 emailDialog.innerHTML = '';
             };
 
+            const emailSpinner = () => {
+                spinnerEmail.style.display = '';
+            };
+
             createButtonHeader.addEventListener('click', () => {
                 createDialog.classList.remove('hidden');
             });
@@ -469,6 +486,7 @@
                     if(htmlRes.status === 200 && !htmlRes.redirected) {
                         emailDialog.innerHTML = await htmlRes.text();
                         document.querySelector('#close').addEventListener('click', clearEmailDialog);
+                        document.querySelector('#email-forum').addEventListener('submit', emailSpinner);
                     } else {
                         window.location.reload();
                     }