diff --git a/templates/element/genericElements/Form/genericForm.php b/templates/element/genericElements/Form/genericForm.php
index 9e3ba2e..5807da6 100644
--- a/templates/element/genericElements/Form/genericForm.php
+++ b/templates/element/genericElements/Form/genericForm.php
@@ -83,7 +83,7 @@
         $submitButtonData['ajaxSubmit'] = $ajaxSubmit;
     }
     $ajaxFlashMessage = '';
-    if ($ajax) {
+    if (!empty($ajax)) {
         $ajaxFlashMessage = sprintf(
             '<div id="flashContainer"><div id="main-view-container">%s</div></div>',
             $this->Flash->render()
diff --git a/templates/element/genericElements/Form/submitButton.php b/templates/element/genericElements/Form/submitButton.php
index 134e857..55062dd 100644
--- a/templates/element/genericElements/Form/submitButton.php
+++ b/templates/element/genericElements/Form/submitButton.php
@@ -1,5 +1,5 @@
 <?php
-    if ($ajax) {
+    if (!empty($ajax)) {
         echo sprintf(
             '%s',
             sprintf(