diff --git a/app/Http/Controllers/ClientPortalController.php b/app/Http/Controllers/ClientPortalController.php
index 086cd5d0d75a..4374ce485d39 100644
--- a/app/Http/Controllers/ClientPortalController.php
+++ b/app/Http/Controllers/ClientPortalController.php
@@ -977,4 +977,20 @@ class ClientPortalController extends BaseController
 
         return view('invited.details', $data);
     }
+
+    public function updateDetails()
+    {
+        if (! $contact = $this->getContact()) {
+            return $this->returnError();
+        }
+
+        $contact->fill(request()->all());
+        $contact->save();
+
+        $client = $contact->client;
+        $client->fill(request()->all());
+        $client->save();
+
+        return redirect('/client/dashboard');
+    }
 }
diff --git a/resources/views/invited/details.blade.php b/resources/views/invited/details.blade.php
index d7a614af5b20..228f4b993aa5 100644
--- a/resources/views/invited/details.blade.php
+++ b/resources/views/invited/details.blade.php
@@ -19,6 +19,9 @@
                     ->id('payment-form')
                     ->rules(array(
                         'name' => 'required',
+                        'email' => 'required|email',
+                        'first_name' => 'required',
+                        'last_name' => 'required',
                         'vat_number' => 'required',
                         'address1' => 'required',
                         'city' => 'required',
@@ -44,11 +47,31 @@
             <div style="padding-bottom: 22px;">
 
                 <div class="row">
-                    <div class="col-md-6">
-                        {!! Former::text('name')
-                                ->placeholder(trans('texts.name'))
-                                ->label('') !!}
-                    </div>
+                    @if ($client->name)
+                        <div class="col-md-6">
+                            {!! Former::text('name')
+                                    ->placeholder(trans('texts.name'))
+                                    ->label('') !!}
+                        </div>
+                    @else
+                        <div class="col-md-6">
+                            {!! Former::text('first_name')
+                                    ->placeholder(trans('texts.first_name'))
+                                    ->label('') !!}
+                        </div>
+                        <div class="col-md-6">
+                            {!! Former::text('last_name')
+                                    ->placeholder(trans('texts.last_name'))
+                                    ->label('') !!}
+                        </div>
+                    @endif
+                    @if (! $contact->email)
+                        <div class="col-md-6">
+                            {!! Former::text('email')
+                                    ->placeholder(trans('texts.email'))
+                                    ->label('') !!}
+                        </div>
+                    @endif
                     @if ($account->vat_number)
                         <div class="col-md-6">
                             {!! Former::text('vat_number')
@@ -131,7 +154,7 @@
     <script type="text/javascript">
 
         $(function() {
-            $('#country_id, #shipping_country_id').combobox();
+            $('#country_id').combobox();
             $('#first_name').focus();
         });