diff --git a/web/skins/classic/views/donate.php b/web/ajax/modals/donate.php
similarity index 70%
rename from web/skins/classic/views/donate.php
rename to web/ajax/modals/donate.php
index 502377133..374d4e0d2 100644
--- a/web/skins/classic/views/donate.php
+++ b/web/ajax/modals/donate.php
@@ -18,10 +18,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( !canEdit('System') ) {
-  $view = 'error';
-  return;
-}
+if ( !canEdit('System') ) return;
 
 $options = array( 
   'go'      => translate('DonateYes'),
@@ -45,25 +42,25 @@ $options = array(
         </button>
       </div>
       <div class="modal-body">
-        <form name="contentForm" id="contentForm" method="post" action="?">
-          <input type="hidden" name="view" value="donate"/>
-          <input type="hidden" name="action" value="donate"/>
-          <p>
-            <?php echo translate('DonateEnticement') ?>
-          </p>
-          <p>
-            <?php echo buildSelect('option', $options); ?>
-          </p>
-          <div id="contentButtons">
-            <button type="submit"><?php echo translate('Apply') ?></button>
-            <button type="button" data-on-click="closeWindow"><?php echo translate('Close') ?></button>
-          </div>
-        </form>
+      <form name="contentForm" id="donateForm" method="post" action="?">
+        <?php
+        // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+        echo getCSRFinputHTML();
+        ?>
+        <input type="hidden" name="view" value="donate"/>
+        <input type="hidden" name="action" value="donate"/>
+        <p>
+          <?php echo translate('DonateEnticement') ?>
+        </p>
+        <p>
+          <?php echo buildSelect('option', $options); ?>
+        </p>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-        <button type="button" class="btn btn-primary">Understood</button>
+        <button type="submit" class="btn btn-primary" id="donateApplyBtn"><?php echo translate('Apply') ?></button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Close') ?></button>
       </div>
+    </form>
     </div>
   </div>
 </div>
diff --git a/web/includes/actions/donate.php b/web/includes/actions/donate.php
index b8659b269..c85f4509e 100644
--- a/web/includes/actions/donate.php
+++ b/web/includes/actions/donate.php
@@ -49,6 +49,6 @@ if ( $action == 'donate' && isset($_REQUEST['option']) ) {
       Warning("Unknown value for option in donate: $option");
       break;
   } // end switch option
-  $view = 'none';
+  $redirect = '?view=console';
 }
 ?>
diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
index 43523568c..e99f75321 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -438,7 +438,5 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
   </form>
 <?php
   include('function.php');
-  // Include Donate Modal
-  include('donate.php');
   xhtmlFooter();
 ?>
diff --git a/web/skins/classic/views/js/console.js b/web/skins/classic/views/js/console.js
index 522a6910e..6e4b38242 100644
--- a/web/skins/classic/views/js/console.js
+++ b/web/skins/classic/views/js/console.js
@@ -133,7 +133,24 @@ function initPage() {
     window.location.assign('?view=version');
   }
   if ( showDonatePopup ) {
-    $j('#donate').modal('show');
+    $j.getJSON(thisUrl + '?request=modal&modal=donate')
+        .done(function(data) {
+          if ( $j('#donate').length ) {
+            $j('#donate').replaceWith(data.html);
+          } else {
+            $j("body").append(data.html);
+          }
+          $j('#donate').modal('show');
+          // Manage the Apply button
+          $j('#donateApplyBtn').click(function(evt) {
+            evt.preventDefault();
+            $j('#donateForm').submit();
+          });
+        })
+        .fail(function(jqxhr, textStatus, error) {
+          console.log("Request Failed: " + textStatus + ", " + error);
+          console.log("Response Text: " + jqxhr.responseText);
+        });
   }
 
   // Makes table sortable
diff --git a/web/skins/classic/views/js/donate.js b/web/skins/classic/views/js/donate.js
deleted file mode 100644
index eb3c25f50..000000000
--- a/web/skins/classic/views/js/donate.js
+++ /dev/null
@@ -1,3 +0,0 @@
-if ( action == 'donate' && option == 'go' ) {
-  zmWindow('/donate/');
-}
diff --git a/web/skins/classic/views/js/donate.js.php b/web/skins/classic/views/js/donate.js.php
deleted file mode 100644
index 4fc36d5bb..000000000
--- a/web/skins/classic/views/js/donate.js.php
+++ /dev/null
@@ -1,2 +0,0 @@
-var action = '<?php echo isset($_REQUEST['action'])?validJsStr($_REQUEST['action']):'' ?>';
-var option = '<?php echo isset($_REQUEST['option'])?validJsStr($_REQUEST['option']):'' ?>';