diff --git a/app/Http/Requests/User/UpdateUserRequest.php b/app/Http/Requests/User/UpdateUserRequest.php
index 15e1c7bc7374..6b5bbf84a859 100644
--- a/app/Http/Requests/User/UpdateUserRequest.php
+++ b/app/Http/Requests/User/UpdateUserRequest.php
@@ -77,7 +77,11 @@ class UpdateUserRequest extends Request
             unset($input['oauth_user_token']);
         }
 
-
+        if(isset($input['password']) && strlen($input['password'] ?? '') > 1)
+        {
+            $input['password'] = trim($input['password']);
+        }
+        
         $this->replace($input);
     }
 }
diff --git a/resources/views/portal/ninja2020/auth/register.blade.php b/resources/views/portal/ninja2020/auth/register.blade.php
index e5d634b0808d..f18b63a7e012 100644
--- a/resources/views/portal/ninja2020/auth/register.blade.php
+++ b/resources/views/portal/ninja2020/auth/register.blade.php
@@ -29,7 +29,7 @@
                 <div class="grid grid-cols-12 gap-4 mt-10">
                     @if($register_company->client_registration_fields)
                     @foreach($register_company->client_registration_fields as $field)
-                        @if($field['visible'])
+                        @if(isset($field['visible']) && $field['visible'])
                             <div class="col-span-12 md:col-span-6">
                                 <section class="flex items-center">
                                     <label