diff --git a/app/Http/Controllers/ClientPortal/PrePaymentController.php b/app/Http/Controllers/ClientPortal/PrePaymentController.php
index da14524dcad8..7acd355a9bf0 100644
--- a/app/Http/Controllers/ClientPortal/PrePaymentController.php
+++ b/app/Http/Controllers/ClientPortal/PrePaymentController.php
@@ -48,6 +48,9 @@ class PrePaymentController extends Controller
             'allows_recurring' => true,
             'minimum' => $minimum,
             'minimum_amount' =>  $minimum_amount,
+            'notes' => request()->has('notes') ? request()->input('notes') : "",
+            'amount' => request()->has('amount') ? request()->input('amount') : "",
+            'show' => request()->has('is_recurring') ? "true" : "false",
         ];
 
         return $this->render('pre_payments.index', $data);
diff --git a/resources/views/portal/ninja2020/pre_payments/index.blade.php b/resources/views/portal/ninja2020/pre_payments/index.blade.php
index f3e7b5fe76ff..fc602c10bc59 100644
--- a/resources/views/portal/ninja2020/pre_payments/index.blade.php
+++ b/resources/views/portal/ninja2020/pre_payments/index.blade.php
@@ -27,7 +27,7 @@
                     </div>
 
                     @component('portal.ninja2020.components.general.card-element', ['title' =>  ctrans('texts.payment_details')])
-                        <textarea name="notes" class="focus:shadow-soft-primary-outline min-h-unset text-sm leading-5.6 ease-soft block h-auto w-full appearance-none rounded-lg border border-solid border-gray-300 bg-white bg-clip-padding px-3 py-2 font-normal text-gray-700 outline-none transition-all placeholder:text-gray-500 focus:border-fuchsia-300 focus:outline-none"></textarea>
+                        <textarea name="notes" class="focus:shadow-soft-primary-outline min-h-unset text-sm leading-5.6 ease-soft block h-auto w-full appearance-none rounded-lg border border-solid border-gray-300 bg-white bg-clip-padding px-3 py-2 font-normal text-gray-700 outline-none transition-all placeholder:text-gray-500 focus:border-fuchsia-300 focus:outline-none">{{ $notes }}</textarea>
 
                         @if($errors->has('notes'))
                             <p class="mt-2 text-red-900 border-red-300 px-2 py-1 bg-gray-100">{{ $errors->first('notes') }}</p>
@@ -41,6 +41,7 @@
                         type="text"
                         class="input mt-0 mr-4 relative"
                         name="amount"
+                        value="{{ $amount }}"
                         placeholder=""/>
                         
                         @if($minimum > 0) 
@@ -54,9 +55,9 @@
                     @endcomponent
 
                     @if($allows_recurring)
-                    <div x-data="{ show: false }">
+                    <div x-data="{ show: {!! $show !!}, toggle() { this.show = ! this.show } }">
                     @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.enable_recurring')])
-                        <input x-on:click="show = !show" id="is_recurring" aria-describedby="recurring-description" name="is_recurring" type="checkbox" class="h-4 w-4 rounded border-gray-300 text-indigo-600 focus:ring-indigo-600">
+                        <input x-on:click="toggle()" id="is_recurring" aria-describedby="recurring-description" name="is_recurring" type="checkbox" class="h-4 w-4 rounded border-gray-300 text-indigo-600 focus:ring-indigo-600" @if($show == "true") checked @endif>
                     @endcomponent
 
                         <div x-cloak x-show="show">