diff --git a/resources/views/modals/user.blade.php b/resources/views/modals/user.blade.php
index af2863282..fe73ae0d8 100644
--- a/resources/views/modals/user.blade.php
+++ b/resources/views/modals/user.blade.php
@@ -29,7 +29,6 @@
                 <form action="{{ route('api.users.store') }}" onsubmit="return false">
                     <div class="alert alert-danger" id="modal_error_msg" style="display:none">
                     </div>
-                    
                     <!-- Setup of default company, taken from asset creator -->
 					@if ($user->company)
 						<input type="hidden" name="company_id" id='modal-company' value='{{ $user->company->id }}' class="form-control">
@@ -43,10 +42,10 @@
                         @include ('partials.forms.edit.location-profile-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
                     </div>
                     <div class="dynamic-form-row">
-                        @include('partials.forms.edit.name-first', ['class' => 'col-md-8 col-xs-12', 'style' => 'width:65.5%;'])
+                        @include('partials.forms.edit.name-first', ['class' => 'col-md-8 col-xs-12-pull', 'style' => 'width:67%;'])
                     </div>
                     <div class="dynamic-form-row">
-                    @include('partials.forms.edit.name-last', ['class' => 'col-md-8 col-xs-12', 'style' => 'width:65.5%;'])
+                    @include('partials.forms.edit.name-last', ['class' => 'col-md-8 col-xs-12-pull', 'style' => 'width:67%;'])
                     </div>
                     <div class="dynamic-form-row">
                         @include('partials.forms.edit.email')
@@ -56,18 +55,27 @@
                     </div>
 
                     <div class="dynamic-form-row">
-                        <div class="col-md-3 col-xs-12"><label for="modal-password">{{ trans('admin/users/table.password') }}:</label></div>
-                        <div class="col-md-8 col-xs-12 required"><input type='password' name="password" id='modal-password' class="form-control">
-                            <a href="#" class="left" id="modal-genPassword">Generate</a>
+                        <div class="form-group">
+                            <div class="col-md-3 col-xs-12">
+                                <label class="control-label" for="modal-password">{{ trans('admin/users/table.password') }}:</label>
+                            </div>
+                            <div class="col-md-8 col-xs-12 required"><input class="form-control"  type='password' name="password" id='modal-password' class="form-control">
+                                <a href="#" class="left" id="modal-genPassword">Generate</a>
+                            </div>
                         </div>
                     </div>
 
                     <div class="dynamic-form-row">
-                        <div class="col-md-3 col-xs-12"><label for="modal-password_confirmation">{{ trans('admin/users/table.password_confirm') }}:</label></div>
-                        <div class="col-md-8 col-xs-12 required"><input type='password' name="password_confirmation" id='modal-password_confirmation' class="form-control">
+                        <div class="form-group">
+                            <div class="col-md-3 col-xs-12">
+                                <label class="control-label" for="modal-password_confirmation">{{ trans('admin/users/table.password_confirm') }}:</label>
+                            </div>
+                        <div class="col-md-8 col-xs-12 required">
+                            <input class="form-control" type='password' name="password_confirmation" id='modal-password_confirmation' class="form-control">
                             <div id="modal-generated-password"></div>
                         </div>
                     </div>
+                    </div>
                     
 
                     
diff --git a/resources/views/partials/forms/edit/email.blade.php b/resources/views/partials/forms/edit/email.blade.php
index 652b7155c..dc8a4d8d2 100644
--- a/resources/views/partials/forms/edit/email.blade.php
+++ b/resources/views/partials/forms/edit/email.blade.php
@@ -1,7 +1,7 @@
 <div class="form-group {{ $errors->has('email') ? ' has-error' : '' }}">
     <label for="email" class="col-md-3 col-xs-12 control-label">{{ trans('admin/suppliers/table.email') }}</label>
     <div class="col-md-8 col-xs-12">
-        <input type="text" name="email" id="email" value="{{ old('email', ($item->email ?? $user->email)) }}" class="form-control" style="width:98%; display:flex;">
+        <input type="text" name="email" id="email" value="{{ old('email', ($item->email ?? $user->email)) }}" class="form-control" style="width:100%; display:flex;">
         {!! $errors->first('email', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>
\ No newline at end of file
diff --git a/resources/views/partials/forms/edit/name-first.blade.php b/resources/views/partials/forms/edit/name-first.blade.php
index 6911709c5..d7c07947a 100644
--- a/resources/views/partials/forms/edit/name-first.blade.php
+++ b/resources/views/partials/forms/edit/name-first.blade.php
@@ -1,7 +1,11 @@
 <!-- partials/forms/edit/name-first.blade.php -->
+@php
+    $class = $class ?? 'col-md-6';
+    $style = $style ?? '';
+@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 ? $style : ''}}""{{  (Helper::checkIfRequired($user, 'first_name')) ? ' required' : '' }}">
+    <div class="{{$class ? $class : 'col-md-6'}}" style= "{{$style}}""{{  (Helper::checkIfRequired($user, 'first_name')) ? ' required' : '' }}">
         <input class="form-control" type="text" name="first_name" id="first_name" value="{{ old('first_name', $user->first_name) }}" maxlength="191" />
         {!! $errors->first('first_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
     </div>
diff --git a/resources/views/partials/forms/edit/name-last.blade.php b/resources/views/partials/forms/edit/name-last.blade.php
index f5e3d834f..61ef221dc 100644
--- a/resources/views/partials/forms/edit/name-last.blade.php
+++ b/resources/views/partials/forms/edit/name-last.blade.php
@@ -1,7 +1,11 @@
 <!-- partials/forms/edit/name-last.blade.php -->
+@php
+    $class = $class ?? 'col-md-6';
+    $style = $style ?? '';
+@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 ? $class : 'col-md-6'}}" style= "{{$style ? $style : ''}}""{{  (Helper::checkIfRequired($user, 'last_name')) ? ' required' : '' }}">
+    <div class="{{$class}}" style= "{{$style ? $style : ''}}" "{{  (Helper::checkIfRequired($user, 'last_name')) ? ' required' : '' }}">
         <input class="form-control" type="text" name="last_name" id="last_name"  value="{{ old('last_name', $user->last_name) }}" maxlength="191" />
         {!! $errors->first('last_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
     </div>