diff --git a/code/Model/Recipient/EmailRecipient.php b/code/Model/Recipient/EmailRecipient.php
index 815b1bd2..fad9c0d7 100644
--- a/code/Model/Recipient/EmailRecipient.php
+++ b/code/Model/Recipient/EmailRecipient.php
@@ -234,7 +234,7 @@ protected function getFormParent()
         // LeftAndMain::sessionNamespace is protected.
         $sessionNamespace = $this->config()->get('session_namespace') ?: CMSMain::class;
 
-        $formID = Controller::curr()->getRequest()->getSession()->get($sessionNamespace . '.currentPage');
+        $formID = Controller::curr()->getRequest()->getSession()->get($sessionNamespace . '.currentRecord');
         if ($formID) {
             return UserDefinedForm::get()->byID($formID);
         }
diff --git a/code/Model/UserDefinedForm.php b/code/Model/UserDefinedForm.php
index 893385a3..790ab769 100755
--- a/code/Model/UserDefinedForm.php
+++ b/code/Model/UserDefinedForm.php
@@ -20,7 +20,7 @@ class UserDefinedForm extends Page
      * @var string
      * @deprecated 6.4.0 Will be renamed to cms_icon_class
      */
-    private static $icon_class = 'font-icon-p-list';
+    private static $cms_icon_class = 'font-icon-p-list';
 
     private static $class_description = 'Adds a customizable form.';