diff --git a/app/Jobs/User/CreateUser.php b/app/Jobs/User/CreateUser.php
index 9ad0aa5ecf61..351af1ec0333 100644
--- a/app/Jobs/User/CreateUser.php
+++ b/app/Jobs/User/CreateUser.php
@@ -84,7 +84,7 @@ class CreateUser
 
         if(!Ninja::isSelfHost()){
             nlog("in the create user class");
-            event(new UserWasCreated($user, $user, $this->company, Ninja::eventVars(auth()->user()->id)));
+            event(new UserWasCreated($user, $user, $this->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
         }
 
         return $user;
diff --git a/resources/views/portal/ninja2020/subscriptions/switch.blade.php b/resources/views/portal/ninja2020/subscriptions/switch.blade.php
index 3cb6b87c51da..dd688719103e 100644
--- a/resources/views/portal/ninja2020/subscriptions/switch.blade.php
+++ b/resources/views/portal/ninja2020/subscriptions/switch.blade.php
@@ -8,10 +8,10 @@
             <!-- 1) Subscription we're switching from -->
             <div
                 class="col-span-12 md:col-start-2 md:col-span-4 bg-white rounded px-4 py-5 shadow hover:shadow-lg">
-                <span class="text-sm uppercase text-gray-900">Current plan:</span>
-                <p class="mt-4">Placeholder text for plan notes, some text.</p>
+                <span class="text-sm uppercase text-gray-900">{{ ctrans('texts.current') }}</span>
+                <p class="mt-4">{{ $subscription->name }}</p>
                 <div class="flex justify-end mt-2">
-                    <span>$10</span>
+                    <span> {{ \App\Utils\Number::formatMoney($subscription->price, $subscription->company) }}</span>
                 </div>
             </div>
 
@@ -33,10 +33,10 @@
 
             <!-- 2) Subscription we're switching to -->
             <div class="col-span-12 md:col-span-4 bg-white rounded px-4 py-5 shadow border hover:shadow-lg group-hover:border-transparent">
-                <span class="text-sm uppercase text-gray-900">Switching to:</span>
-                <p class="mt-4">Placeholder text for plan notes, some text.</p>
+                <span class="text-sm uppercase text-gray-900">{{ ctrans('texts.change') }}</span>
+                <p class="mt-4">{{ $target->name }}</p>
                 <div class="flex justify-end mt-2">
-                    <span>$10</span>
+                    <span> {{ \App\Utils\Number::formatMoney($target->price, $target->company) }}</span>
                 </div>
             </div>
         </div>