diff --git a/app/Jobs/User/CreateUser.php b/app/Jobs/User/CreateUser.php
index 4a81aad3d5c3..e08b403e1b95 100644
--- a/app/Jobs/User/CreateUser.php
+++ b/app/Jobs/User/CreateUser.php
@@ -65,6 +65,10 @@ class CreateUser
         $user->email = $this->request['email']; //todo need to remove this in production
         $user->last_login = now();
         $user->ip = request()->ip();
+
+        if(Ninja::isSelfHost())
+            $user->email_verified_at = now();
+
         $user->save();
 
         $user->companies()->attach($this->company->id, [
@@ -78,7 +82,8 @@ class CreateUser
             'settings' => null,
         ]);
 
-        event(new UserWasCreated($user, $user, $this->company, Ninja::eventVars()));
+        if(!Ninja::isSelfHost())
+            event(new UserWasCreated($user, $user, $this->company, Ninja::eventVars()));
 
         return $user;
     }
diff --git a/app/Listeners/Mail/MailSentListener.php b/app/Listeners/Mail/MailSentListener.php
index 4eeca50018cc..ff319b18390d 100644
--- a/app/Listeners/Mail/MailSentListener.php
+++ b/app/Listeners/Mail/MailSentListener.php
@@ -45,7 +45,7 @@ class MailSentListener implements ShouldQueue
 
                 $postmark_id = $event->message->getHeaders()->get('x-pm-message-id')->getValue();
 
-                nlog($postmark_id);
+                // nlog($postmark_id);
                 $invitation = $event->message->invitation;
                 $invitation->message_id = $postmark_id;
                 $invitation->save();
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index 100166704893..adbe57eb1ff7 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -271,7 +271,7 @@ class HtmlEngine
 
         $data['$company.city_state_postal'] = ['value' => $this->company->present()->cityStateZip($this->settings->city, $this->settings->state, $this->settings->postal_code, false) ?: ' ', 'label' => ctrans('texts.city_state_postal')];
         $data['$company.postal_city_state'] = ['value' => $this->company->present()->cityStateZip($this->settings->city, $this->settings->state, $this->settings->postal_code, true) ?: ' ', 'label' => ctrans('texts.postal_city_state')];
-        $data['$company.name'] = ['value' => $this->settings->name ?: ' ', 'label' => ctrans('texts.company_name')];
+        $data['$company.name'] = ['value' => $this->settings->name ?: ctrans('texts.untitled_account'), 'label' => ctrans('texts.company_name')];
         $data['$company.address1'] = ['value' => $this->settings->address1 ?: ' ', 'label' => ctrans('texts.address1')];
         $data['$company.address2'] = ['value' => $this->settings->address2 ?: ' ', 'label' => ctrans('texts.address2')];
         $data['$company.city'] = ['value' => $this->settings->city ?: ' ', 'label' => ctrans('texts.city')];