diff --git a/include/class.user.php b/include/class.user.php
index 15f35223c7aac2404230d793230d997fe911f618..2d837dad0cf22c7039631027267cb42e6f485126 100644
--- a/include/class.user.php
+++ b/include/class.user.php
@@ -192,7 +192,7 @@ class User extends UserModel {
             if (!$cd->isValid())
                 $valid = false;
             if ($cd->get('type') == 'U'
-                        && ($form= $cd->getForm($data))
+                        && ($form= $cd->getForm($vars))
                         && ($f=$form->getField('email'))
                         && $f->getClean()
                         && ($u=User::lookup(array('emails__address'=>$f->getClean())))
diff --git a/include/i18n/en_US/help/tips/forms.yaml b/include/i18n/en_US/help/tips/forms.yaml
index 8ce3b89a52a47e32a7adcf1b34fd23d0af3b4683..e9af021772a1274984bc40d72742a4ef3f69ffcc 100644
--- a/include/i18n/en_US/help/tips/forms.yaml
+++ b/include/i18n/en_US/help/tips/forms.yaml
@@ -73,7 +73,7 @@ field_variable:
         <strong>variable</strong> is the name used in this column.<br>
         <br>
         <em>Company information is available via
-        <code>%{company.variable}</code> and user information is available
+        <code>%{</code><code>company.variable}</code> and user information is available
         via <code>%{ticket.user.variable}</code></em>
 
 field_delete:
diff --git a/setup/test/tests/stubs.php b/setup/test/tests/stubs.php
index 5a78251f344216485656356b1c129ed2e1ab2b0d..591700ec50f0ef88f208b141c0347e170ae662c9 100644
--- a/setup/test/tests/stubs.php
+++ b/setup/test/tests/stubs.php
@@ -9,6 +9,7 @@ class mysqli {
     function ssl_set() {}
     function real_connect() {}
     function select_db() {}
+    function set_charset() {}
 }
 
 class mysqli_stmt {