diff --git a/include/class.mailer.php b/include/class.mailer.php
index 51694795ee7995c6d357a3d89452e2cb1ac68e04..65e98f500d47223d0881e6b6a91024e05ac5c090 100644
--- a/include/class.mailer.php
+++ b/include/class.mailer.php
@@ -162,10 +162,14 @@ class Mailer {
             $isHtml = false;
         }
 
-        $domain = 'local';
         if ($isHtml && $cfg && $cfg->isHtmlThreadEnabled()) {
-            // TODO: Lookup helpdesk domain
-            $domain = substr(md5($ost->getConfig()->getURL()), -12);
+            // Pick a domain compatible with pear Mail_Mime
+            $matches = array();
+            if (preg_match('#(@[0-9a-zA-Z\-\.]+)#', $this->getFromAddress(), $matches)) {
+                $domain = $matches[1];
+            } else {
+                $domain = '@localhost';
+            }
             // Format content-ids with the domain, and add the inline images
             // to the email attachment list
             $self = $this;
@@ -175,10 +179,10 @@ class Mailer {
                         return $match[0];
                     $mime->addHTMLImage($file->getData(),
                         $file->getType(), $file->getName(), false,
-                        $match[1].'@'.$domain);
+                        $match[1].$domain);
                     // Don't re-attach the image below
                     unset($self->attachments[$file->getId()]);
-                    return $match[0].'@'.$domain;
+                    return $match[0].$domain;
                 }, $message);
             // Add an HTML body
             $mime->setHTMLBody($message);
diff --git a/include/class.ticket.php b/include/class.ticket.php
index c5e495ebd28b55bc84d0ffc986c6286d77587856..61d963286fb998bf31d5051b22ef941a04635b37 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -2271,7 +2271,7 @@ class Ticket {
             if (!$user) {
                 $user_form = UserForm::getUserForm()->getForm($vars);
                 if (!$user_form->isValid($field_filter('user'))
-                        || !($user=User::fromForm($user_form->getClean())))
+                        || !($user=User::fromVars($user_form->getClean())))
                     $errors['user'] = 'Incomplete client information';
             }
         }
diff --git a/include/i18n/en_US/group.yaml b/include/i18n/en_US/group.yaml
index 942222cbd1a04c4cc883323fd34dfd555f6ed054..019aa75ef1aef197418c305060e92123a43784ff 100644
--- a/include/i18n/en_US/group.yaml
+++ b/include/i18n/en_US/group.yaml
@@ -67,7 +67,7 @@
 
   depts: [1, 2, 3]
 
-- isactve: 1
+- isactive: 1
   name: Staff
   notes: |
     Lowly staff members