diff --git a/resources/views/portal/ninja2020/components/livewire/billing-portal-purchase.blade.php b/resources/views/portal/ninja2020/components/livewire/billing-portal-purchase.blade.php
index 7bd196087c70..abd31174910b 100644
--- a/resources/views/portal/ninja2020/components/livewire/billing-portal-purchase.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/billing-portal-purchase.blade.php
@@ -189,20 +189,26 @@
                     <form wire:submit="handleRff">
                         @csrf
 
+                        @if(strlen($contact->first_name) === 0)
                         <div class="col-auto mt-3">
                             <label for="first_name" class="input-label">{{ ctrans('texts.first_name') }}</label>
                             <input id="first_name" class="input w-full" wire:model="contact_first_name" />
                         </div>
+                        @endif
 
-                        <div class="col-auto mt-3">
+                        @if(strlen($contact->last_name) === 0)
+                        <div class="col-auto mt-3 @if($contact->last_name) !== 0) hidden @endif">
                             <label for="last_name" class="input-label">{{ ctrans('texts.last_name') }}</label>
                             <input id="last_name" class="input w-full" wire:model="contact_last_name" />
                         </div>
+                        @endif
 
+                        @if(strlen($contact->email) === 0)
                         <div class="col-auto mt-3 @if($contact->email) !== 0) hidden @endif">
                             <label for="email" class="input-label">{{ ctrans('texts.email') }}</label>
                             <input id="email" class="input w-full" wire:model="contact_email" />
                         </div>
+                        @endif
 
                         <button 
                             type="submit"