diff --git a/resources/views/partials/forms/edit/name-first.blade.php b/resources/views/partials/forms/edit/name-first.blade.php
index a73b7cbdb5..bc95b4edd1 100644
--- a/resources/views/partials/forms/edit/name-first.blade.php
+++ b/resources/views/partials/forms/edit/name-first.blade.php
@@ -3,11 +3,12 @@
     $class = $class ?? 'col-md-6';
     $style = $style ?? '';
     $required = $required ?? '';
+    $value = $value ?? $user->first_name;
 @endphp
 <div class="form-group {{ $errors->has('first_name') ? 'has-error' : '' }}">
     <label class="col-md-3 control-label" for="first_name">{{ trans('general.first_name') }}</label>
     <div class="{{$class ? $class : 'col-md-6'}}" style= "{{$style}}">
-        <input class="form-control" type="text" name="first_name" id="first_name" value="{{ old('first_name', $user->first_name) }}" {{$required ? 'required' : ''}} maxlength="191" {{  (Helper::checkIfRequired($user, 'first_name')) ? ' required' : '' }}/>
+        <input class="form-control" type="text" name="first_name" id="first_name" value="{{ old('first_name', ($value ?? $user->first_name)) }}" {{$required ? 'required' : ''}} maxlength="191" {{  (Helper::checkIfRequired($user, 'first_name')) ? ' required' : '' }}/>
         {!! $errors->first('first_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
     </div>
 </div>
diff --git a/resources/views/partials/forms/edit/name-last.blade.php b/resources/views/partials/forms/edit/name-last.blade.php
index 127454d78c..354142a78a 100644
--- a/resources/views/partials/forms/edit/name-last.blade.php
+++ b/resources/views/partials/forms/edit/name-last.blade.php
@@ -2,12 +2,13 @@
 @php
     $class = $class ?? 'col-md-6';
     $style = $style ?? '';
-        $required = $required ?? '';
+    $required = $required ?? '';
+    $value = $value ?? $user->last_name;
 @endphp
 <div class="form-group {{ $errors->has('last_name') ? 'has-error' : '' }}">
     <label class="col-md-3 control-label" for="last_name">{{ trans('general.last_name') }} </label>
     <div class="{{$class}}" style= "{{$style ? $style : ''}}">
-        <input class="form-control" type="text" name="last_name" id="last_name"  value="{{ old('last_name', $user->last_name) }}" maxlength="191"{{  (Helper::checkIfRequired($user, 'last_name')) ? ' required' : '' }} />
+        <input class="form-control" type="text" name="last_name" id="last_name"  value="{{ old('last_name', ($value ?? $user->last_name)) }}" maxlength="191"{{  (Helper::checkIfRequired($user, 'last_name')) ? ' required' : '' }} />
         {!! $errors->first('last_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
     </div>
 </div>