diff --git a/app/Http/Controllers/Frontend/PirepController.php b/app/Http/Controllers/Frontend/PirepController.php
index 804e1c827..d154e7338 100644
--- a/app/Http/Controllers/Frontend/PirepController.php
+++ b/app/Http/Controllers/Frontend/PirepController.php
@@ -532,13 +532,13 @@ public function edit(string $id): RedirectResponse|View
         }
 
         $airports = [
-            ['' => ''],
-            [$pirep->arr_airport->id => $pirep->arr_airport->full_name],
-            [$pirep->dpt_airport->id => $pirep->dpt_airport->full_name],
+            ''                      => '',
+            $pirep->arr_airport->id => $pirep->arr_airport->full_name,
+            $pirep->dpt_airport->id => $pirep->dpt_airport->full_name,
         ];
 
         if ($pirep->alt_airport) {
-            $airports[] = [$pirep->alt_airport->id => $pirep->alt_airport->full_name];
+            $airports[$pirep->alt_airport->id] = $pirep->alt_airport->full_name;
         }
 
         return view('pireps.edit', [
diff --git a/app/Http/Controllers/Frontend/ProfileController.php b/app/Http/Controllers/Frontend/ProfileController.php
index eb19cc7a5..9b940fa36 100644
--- a/app/Http/Controllers/Frontend/ProfileController.php
+++ b/app/Http/Controllers/Frontend/ProfileController.php
@@ -106,7 +106,7 @@ public function show(int $id): RedirectResponse|View
     public function edit(Request $request): RedirectResponse|View
     {
         /** @var \App\Models\User $user */
-        $user = User::with('fields.field', 'location')->where('id', Auth::id())->first();
+        $user = User::with('fields.field', 'home_airport')->where('id', Auth::id())->first();
 
         if (empty($user)) {
             Flash::error('User not found!');
@@ -114,8 +114,8 @@ public function edit(Request $request): RedirectResponse|View
             return redirect(route('frontend.dashboard.index'));
         }
 
-        if ($user->location) {
-            $airports = [$user->location->id => $user->location->description];
+        if ($user->home_airport) {
+            $airports = [$user->home_airport->id => $user->home_airport->description];
         } else {
             $airports = ['' => ''];
         }
diff --git a/resources/views/layouts/default/auth/login.blade.php b/resources/views/layouts/default/auth/login.blade.php
index 7918c9398..8e6f883ca 100644
--- a/resources/views/layouts/default/auth/login.blade.php
+++ b/resources/views/layouts/default/auth/login.blade.php
@@ -4,7 +4,8 @@
 @section('content')
   <div class="col-md-4 ml-auto mr-auto content-center">
     <div class="card card-login card-plain">
-      {{ Form::open(['url' => url('/login'), 'method' => 'post', 'class' => 'form']) }}
+      <form method="post" action="{{ url('/login') }}" class="form">
+        @csrf
       <div class="header header-primary text-center">
         <div class="logo-container" style="width: 320px;">
           <img src="{{ public_asset('/assets/frontend/img/logo.svg') }}" width="320" height="320"
@@ -18,14 +19,15 @@
               <i class="now-ui-icons users_circle-08"></i>
             </span>
           </div>
-          {{
-            Form::text('email', old('email'), [
-              'id' => 'email',
-              'placeholder' => __('common.email').' '.__('common.or').' '.__('common.pilot_id'),
-              'class' => 'form-control',
-              'required' => true,
-            ])
-          }}
+          <input
+            type="text"
+            name="email"
+            id="email"
+            class="form-control"
+            value="{{ old('email') }}"
+            placeholder="@lang('common.email') @lang('common.or') @lang('common.pilot_id')"
+            required
+          />
         </div>
         @if ($errors->has('email'))
           <span class="help-block">
@@ -39,14 +41,14 @@
               <i class="now-ui-icons text_caps-small"></i>
             </span>
           </div>
-          {{
-              Form::password('password', [
-                  'name' => 'password',
-                  'class' => 'form-control',
-                  'placeholder' => __('auth.password'),
-                  'required' => true,
-              ])
-          }}
+          <input
+            type="password"
+            name="password"
+            id="password"
+            class="form-control"
+            placeholder="@lang('auth.password')"
+            required
+          />
         </div>
         @if ($errors->has('password'))
           <span class="help-block">
@@ -73,7 +75,7 @@
           <a href="{{ url('/password/reset') }}" class="link">@lang('auth.forgotpassword')?</a>
         </h6>
       </div>
-      {{ Form::close() }}
+      </form>
     </div>
   </div>
 @endsection
diff --git a/resources/views/layouts/default/auth/passwords/reset.blade.php b/resources/views/layouts/default/auth/passwords/reset.blade.php
index 8c4c9b408..4c839f6b2 100644
--- a/resources/views/layouts/default/auth/passwords/reset.blade.php
+++ b/resources/views/layouts/default/auth/passwords/reset.blade.php
@@ -8,14 +8,9 @@
         <div class="panel panel-default">
           <div class="panel-heading">{{ __('Reset Password') }}</div>
           <div class="panel-body">
-            {{ Form::open([
-                'url' => url('/password/reset'),
-                'method' => 'post',
-                'role' => 'form',
-                'class' => 'form-horizontal',
-                ])
-            }}
-            <input type="hidden" name="token" value="{{ $token }}">
+            <form method="post" action="{{ url('/password/reset') }}" class="form-horizontal">
+             @csrf
+             <input type="hidden" name="token" value="{{ $token }}">
 
             <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
               <label for="email" class="col-md-4 control-label">{{ __('Email Address') }}</label>
@@ -26,8 +21,8 @@
 
                 @if ($errors->has('email'))
                   <span class="help-block">
-                                        <strong>{{ $errors->first('email') }}</strong>
-                                    </span>
+                    <strong>{{ $errors->first('email') }}</strong>
+                  </span>
                 @endif
               </div>
             </div>
@@ -40,8 +35,8 @@
 
                 @if ($errors->has('password'))
                   <span class="help-block">
-                                        <strong>{{ $errors->first('password') }}</strong>
-                                    </span>
+                    <strong>{{ $errors->first('password') }}</strong>
+                  </span>
                 @endif
               </div>
             </div>
@@ -53,8 +48,8 @@
 
                 @if ($errors->has('password_confirmation'))
                   <span class="help-block">
-                                        <strong>{{ $errors->first('password_confirmation') }}</strong>
-                                    </span>
+                    <strong>{{ $errors->first('password_confirmation') }}</strong>
+                  </span>
                 @endif
               </div>
             </div>
@@ -66,7 +61,7 @@
                 </button>
               </div>
             </div>
-            {{ Form::close() }}
+            </form>
           </div>
         </div>
       </div>
diff --git a/resources/views/layouts/default/auth/register.blade.php b/resources/views/layouts/default/auth/register.blade.php
index 6e6fdf0be..752919e7c 100644
--- a/resources/views/layouts/default/auth/register.blade.php
+++ b/resources/views/layouts/default/auth/register.blade.php
@@ -6,14 +6,14 @@
     <div class="col-sm-3"></div>
     <div class="col-sm-6">
 
-      {{ Form::open(['url' => '/register', 'class' => 'form-signin']) }}
-
+      <form method="post" action="{{ url('/register') }}" class="form-signin">
+      @csrf
       <div class="panel periodic-login">
         <div class="panel-body">
           <h2>@lang('common.register')</h2>
           <label for="name" class="control-label">@lang('auth.fullname')</label>
           <div class="input-group form-group-no-border {{ $errors->has('name') ? 'has-danger' : '' }}">
-            {{ Form::text('name', null, ['class' => 'form-control']) }}
+            <input type="text" name="name" id="name" class="form-control" value="{{ old('name') }}" />
           </div>
           @if ($errors->has('name'))
             <p class="text-danger">{{ $errors->first('name') }}</p>
@@ -21,7 +21,7 @@
 
           <label for="email" class="control-label">@lang('auth.emailaddress')</label>
           <div class="input-group form-group-no-border {{ $errors->has('email') ? 'has-danger' : '' }}">
-            {{ Form::text('email', null, ['class' => 'form-control']) }}
+            <input type="email" name="email" id="email" class="form-control" value="{{ old('email') }}" />
           </div>
           @if ($errors->has('email'))
             <p class="text-danger">{{ $errors->first('email') }}</p>
@@ -29,7 +29,11 @@
 
           <label for="airline" class="control-label">@lang('common.airline')</label>
           <div class="input-group form-group-no-border {{ $errors->has('airline') ? 'has-danger' : '' }}">
-            {{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
+            <select name="airline_id" id="airline_id" class="form-control select2">
+              @foreach($airlines as $airline_id => $airline_label)
+                <option value="{{ $airline_id }}" @if($airline_id === old('airline_id')) selected @endif>{{ $airline_label }}</option>
+              @endforeach
+            </select>
           </div>
           @if ($errors->has('airline_id'))
             <p class="text-danger">{{ $errors->first('airline_id') }}</p>
@@ -37,7 +41,11 @@
 
           <label for="home_airport" class="control-label">@lang('airports.home')</label>
           <div class="input-group form-group-no-border {{ $errors->has('home_airport') ? 'has-danger' : '' }}">
-            {{ Form::select('home_airport_id', $airports, null , ['class' => 'form-control airport_search '.($hubs_only?'hubs_only':'')]) }}
+            <select name="home_airport_id" id="home_airport_id" class="form-control airport_search @if($hubs_only) hubs_only @endif">
+              @foreach($airports as $airport_id => $airport_label)
+                <option value="{{ $airport_id }}">{{ $airport_label }}</option>
+              @endforeach
+            </select>
           </div>
           @if ($errors->has('home_airport_id'))
             <p class="text-danger">{{ $errors->first('home_airport_id') }}</p>
@@ -45,7 +53,11 @@
 
           <label for="country" class="control-label">@lang('common.country')</label>
           <div class="input-group form-group-no-border {{ $errors->has('country') ? 'has-danger' : '' }}">
-            {{ Form::select('country', $countries, null, ['class' => 'form-control select2' ]) }}
+            <select name="country" id="country" class="form-control select2">
+              @foreach($countries as $country_id => $country_label)
+                <option value="{{ $country_id }}" @if($country_id === old('country')) selected @endif>{{ $country_label }}</option>
+              @endforeach
+            </select>
           </div>
           @if ($errors->has('country'))
             <p class="text-danger">{{ $errors->first('country') }}</p>
@@ -53,7 +65,15 @@
 
           <label for="timezone" class="control-label">@lang('common.timezone')</label>
           <div class="input-group form-group-no-border {{ $errors->has('timezone') ? 'has-danger' : '' }}">
-            {{ Form::select('timezone', $timezones, null, ['id'=>'timezone', 'class' => 'form-control select2' ]) }}
+            <select name="timezone" id="timezone" class="form-control select2">
+              @foreach($timezones as $group_name => $group_timezones)
+                <optgroup label="{{ $group_name }}">
+                  @foreach($group_timezones as $timezone_id => $timezone_label)
+                    <option value="{{ $timezone_id }}" @if($timezone_id === old('timezone')) selected @endif>{{ $timezone_label }}</option>
+                  @endforeach
+                </optgroup>
+              @endforeach
+            </select>
           </div>
           @if ($errors->has('timezone'))
             <p class="text-danger">{{ $errors->first('timezone') }}</p>
@@ -62,7 +82,7 @@
           @if (setting('pilots.allow_transfer_hours') === true)
             <label for="transfer_time" class="control-label">@lang('auth.transferhours')</label>
             <div class="input-group form-group-no-border {{ $errors->has('transfer_time') ? 'has-danger' : '' }}">
-              {{ Form::number('transfer_time', 0, ['class' => 'form-control']) }}
+              <input type="number" name="transfer_time" id="transfer_time" class="form-control" value="{{ old('transfer_time') }}" />
             </div>
             @if ($errors->has('transfer_time'))
               <p class="text-danger">{{ $errors->first('transfer_time') }}</p>
@@ -71,7 +91,7 @@
 
           <label for="password" class="control-label">@lang('auth.password')</label>
           <div class="input-group form-group-no-border {{ $errors->has('password') ? 'has-danger' : '' }}">
-            {{ Form::password('password', ['class' => 'form-control']) }}
+            <input type="password" name="password" id="password" class="form-control" />
           </div>
           @if ($errors->has('password'))
             <p class="text-danger">{{ $errors->first('password') }}</p>
@@ -79,7 +99,7 @@
 
           <label for="password_confirmation" class="control-label">@lang('passwords.confirm')</label>
           <div class="input-group form-group-no-border {{ $errors->has('password_confirmation') ? 'has-danger' : '' }}">
-            {{ Form::password('password_confirmation', ['class' => 'form-control']) }}
+            <input type="password" name="password_confirmation" id="password_confirmation" class="form-control" />
           </div>
           @if ($errors->has('password_confirmation'))
             <p class="text-danger">{{ $errors->first('password_confirmation') }}</p>
@@ -89,7 +109,7 @@
             @foreach($userFields as $field)
               <label for="field_{{ $field->slug }}" class="control-label">{{ $field->name }}</label>
               <div class="input-group form-group-no-border {{ $errors->has('field_'.$field->slug) ? 'has-danger' : '' }}">
-                {{ Form::text('field_'.$field->slug, null, ['class' => 'form-control']) }}
+                <input type="text" name="field_{{ $field->slug }}" id="field_{{ $field->slug }}" class="form-control" value="{{ old('field_' .$field->slug) }}" />
               </div>
               @if ($errors->has('field_'.$field->slug))
                 <p class="text-danger">{{ $errors->first('field_'.$field->slug) }}</p>
@@ -106,8 +126,8 @@
           @endif
 
           @if($invite)
-            {{ Form::hidden('invite', $invite->id) }}
-            {{ Form::hidden('invite_token', base64_encode($invite->token)) }}
+            <input type="hidden" name="invite" value="{{ $invite->id }}" />
+            <input type="hidden" name="invite_token" value="{{ base64_encode($invite->token) }}" />
           @endif
 
           <div>
@@ -119,8 +139,7 @@
             <tr>
               <td style="vertical-align: top; padding: 5px 10px 0 0">
                 <div class="input-group form-group-no-border">
-                  {{ Form::hidden('toc_accepted', 0, false) }}
-                  {{ Form::checkbox('toc_accepted', 1, null, ['id' => 'toc_accepted']) }}
+                  <input type="checkbox" name="toc_accepted" id="toc_accepted" />
                 </div>
               </td>
               <td style="vertical-align: top;">
@@ -133,8 +152,8 @@
             <tr>
               <td>
                 <div class="input-group form-group-no-border">
-                  {{ Form::hidden('opt_in', 0, false) }}
-                  {{ Form::checkbox('opt_in', 1, null) }}
+                  <input type="hidden" name="opt_in" value="0"/>
+                  <input type="checkbox" name="opt_in" id="opt_in" value="1"/>
                 </div>
               </td>
               <td>
@@ -144,16 +163,14 @@
           </table>
 
           <div style="width: 100%; text-align: right; padding-top: 20px;">
-            {{ Form::submit(__('auth.register'), [
-                'id' => 'register_button',
-                'class' => 'btn btn-primary',
-                'disabled' => true,
-               ]) }}
+              <button type="submit" class="btn btn-primary" id="register_button" disabled>
+                @lang('auth.register')
+              </button>
           </div>
 
         </div>
       </div>
-      {{ Form::close() }}
+      </form>
     </div>
     <div class="col-sm-4"></div>
   </div>
diff --git a/resources/views/layouts/default/flights/search.blade.php b/resources/views/layouts/default/flights/search.blade.php
index 62d8100ef..df354642d 100644
--- a/resources/views/layouts/default/flights/search.blade.php
+++ b/resources/views/layouts/default/flights/search.blade.php
@@ -2,53 +2,64 @@
 <div class="row">
   <div class="col-12">
     <div class="form-group search-form">
-      {{ Form::open([
-              'route' => 'frontend.flights.search',
-              'method' => 'GET',
-      ]) }}
-
+      <form method="get" action="{{ route('frontend.flights.search') }}">
+        @csrf
       <div>
         <div class="form-group">
           <div>@lang('common.airline')</div>
-          {{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
+          <select name="airline_id" id="airline_id" class="form-control select2">
+            @foreach($airlines as $airline_id => $airline_label)
+              <option value="{{ $airline_id }}" @if(request()->get('airline_id') == $airline_id) selected @endif>{{ $airline_label }}</option>
+            @endforeach
+          </select>
         </div>
       </div>
 
       <div class="mt-3">
         <div>@lang('flights.flighttype')</div>
-        {{ Form::select('flight_type', $flight_types, null , ['class' => 'form-control select2']) }}
+        <select name="flight_type" id="flight_type" class="form-control select2">
+          @foreach($flight_types as $flight_type_id => $flight_type_label)
+            <option value="{{ $flight_type_id }}" @if(request()->get('flight_type') == $flight_type_id) selected @endif>{{ $flight_type_label }}</option>
+          @endforeach
+        </select>
       </div>
 
       <div class="mt-3">
         <div>@lang('flights.flightnumber')</div>
-        {{ Form::text('flight_number', null, ['class' => 'form-control']) }}
+        <input type="text" name="flight_number" id="flight_number" class="form-control" value="{{ request()->get('flight_number') }}" />
       </div>
 
       <div class="mt-3">
         <div>@lang('flights.code')</div>
-        {{ Form::text('route_code', null, ['class' => 'form-control']) }}
+        <input type="text" name="route_code" id="route_code" class="form-control" value="{{ request()->get('route_code') }}" />
       </div>
 
       <div class="mt-3">
         <div>@lang('airports.departure')</div>
-        {{ Form::select('dep_icao', [], null , ['class' => 'form-control airport_search']) }}
+        <select name="dep_icao" id="dep_icao" class="form-control airport_search">
+        </select>
       </div>
 
       <div class="mt-3">
         <div>@lang('airports.arrival')</div>
-        {{ Form::select('arr_icao', [], null , ['class' => 'form-control airport_search']) }}
+        <select name="arr_icao" id="arr_icao" class="form-control airport_search">
+        </select>
       </div>
 
       <div class="mt-3">
         <div>@lang('common.subfleet')</div>
-        {{ Form::select('subfleet_id', $subfleets, null , ['class' => 'form-control select2']) }}
+        <select name="subfleet_id" id="subfleet_id" class="form-control select2">
+          @foreach($subfleets as $subfleet_id => $subfleet_label)
+            <option value="{{ $subfleet_id }}" @if(request()->get('subfleet_id') == $subfleet_id) selected @endif>{{ $subfleet_label }}</option>
+          @endforeach
+        </select>
       </div>
 
       <div class="clear mt-3" style="margin-top: 10px;">
-        {{ Form::submit(__('common.find'), ['class' => 'btn btn-outline-primary']) }}&nbsp;
+        <button type="submit" class="btn btn-outline-primary">@lang('common.find')</button>
         <a href="{{ route('frontend.flights.index') }}">@lang('common.reset')</a>
       </div>
-      {{ Form::close() }}
+      </form>
     </div>
   </div>
 </div>
diff --git a/resources/views/layouts/default/pireps/create.blade.php b/resources/views/layouts/default/pireps/create.blade.php
index 1dcef11ba..4433eea16 100644
--- a/resources/views/layouts/default/pireps/create.blade.php
+++ b/resources/views/layouts/default/pireps/create.blade.php
@@ -6,15 +6,11 @@
     <div class="col-md-12">
       <h2>@lang('pireps.newflightreport')</h2>
       @include('flash::message')
-      @if(!empty($pirep))
-        {{ Form::model($pirep, ['route' => 'frontend.pireps.store']) }}
-      @else
-        {{ Form::open(['route' => 'frontend.pireps.store']) }}
-      @endif
 
-      @include('pireps.fields')
-
-      {{ Form::close() }}
+      <form method="post" action="{{ route('frontend.pireps.store') }}">
+        @csrf
+        @include('pireps.fields')
+      </form>
     </div>
   </div>
 @endsection
diff --git a/resources/views/layouts/default/pireps/custom_fields.blade.php b/resources/views/layouts/default/pireps/custom_fields.blade.php
index 37363599b..83de3d23a 100644
--- a/resources/views/layouts/default/pireps/custom_fields.blade.php
+++ b/resources/views/layouts/default/pireps/custom_fields.blade.php
@@ -11,10 +11,7 @@
   <td>
     <div class="input-group input-group-sm form-group">
       @if(!$field->read_only)
-        {{ Form::text($field->slug, $field->value, [
-            'class' => 'form-control',
-            'readonly' => (!empty($pirep) && $pirep->read_only),
-            ]) }}
+        <input type="text" name="{{ $field->slug }}" id="{{ $field->slug }}" class="form-control" value="{{ $field->value }}" @if(!empty($pirep) && $pirep->read_only) readonly @endif/>
       @else
         {{ $field->value }}
       @endif
diff --git a/resources/views/layouts/default/pireps/edit.blade.php b/resources/views/layouts/default/pireps/edit.blade.php
index 77369b825..db01c2383 100644
--- a/resources/views/layouts/default/pireps/edit.blade.php
+++ b/resources/views/layouts/default/pireps/edit.blade.php
@@ -5,14 +5,12 @@
     <div class="col-md-12">
       <h2>@lang('pireps.editflightreport')</h2>
       @include('flash::message')
-      {{ Form::model($pirep, [
-              'route' => ['frontend.pireps.update', $pirep->id],
-              'class' => 'form-group',
-              'method' => 'patch']) }}
+      <form method="post" action="{{ route('frontend.pireps.update', $pirep->id) }}" class="form-group">
+        @method('PATCH')
+        @csrf
 
-      @include('pireps.fields')
-
-      {{ Form::close() }}
+        @include('pireps.fields')
+      </form>
     </div>
   </div>
 @endsection
diff --git a/resources/views/layouts/default/pireps/fares.blade.php b/resources/views/layouts/default/pireps/fares.blade.php
index d2e959db5..50031ab7d 100644
--- a/resources/views/layouts/default/pireps/fares.blade.php
+++ b/resources/views/layouts/default/pireps/fares.blade.php
@@ -7,9 +7,9 @@
       @foreach($aircraft->subfleet->fares as $fare)
         <div class="row">
           <div class="col">
-            {{Form::label('fare_'.$fare->id, $fare->name.' ('. \App\Models\Enums\FareType::label($fare->type).', code '.$fare->code.')')}}
+            <label for="fare_{{ $fare->id }}">{{ $fare->name.' ('. \App\Models\Enums\FareType::label($fare->type).', code '.$fare->code.')' }}</label>
             <div class="input-group form-group">
-              {{ Form::number('fare_'.$fare->id, $fare->count, ['class' => 'form-control', 'min' => 0]) }}
+              <input type="number" name="fare_{{ $fare->id }}" id="fare_{{ $fare->id }}" class="form-control" min="0" value="{{ old('fare_'.$fare->id) }}">
             </div>
           </div>
         </div>
diff --git a/resources/views/layouts/default/pireps/fields.blade.php b/resources/views/layouts/default/pireps/fields.blade.php
index df29dfb82..0301a1a21 100644
--- a/resources/views/layouts/default/pireps/fields.blade.php
+++ b/resources/views/layouts/default/pireps/fields.blade.php
@@ -26,48 +26,60 @@
       <div class="form-container-body">
         <div class="row">
           <div class="col-sm-4">
-            {{ Form::label('airline_id', __('common.airline')) }}
+            <label for="airline_id">@lang('common.airline')</label>
             @if(!empty($pirep) && $pirep->read_only)
               <p>{{ $pirep->airline->name }}</p>
-              {{ Form::hidden('airline_id') }}
+              <input type="hidden" name="airline_id" value="{{ $pirep->airline_id }}" />
             @else
               <div class="input-group input-group form-group">
-                {{ Form::select('airline_id', $airline_list, null, [
-                    'class' => 'custom-select select2',
-                    'style' => 'width: 100%',
-                    'readonly' => (!empty($pirep) && $pirep->read_only),
-                ]) }}
+                <select name="airline_id" id="airline_id" class="custom-select select2" style="width: 100%">
+                  @foreach($airline_list as $airline_id => $airline_label)
+                    <option value="{{ $airline_id }}" @if(!empty($pirep) && $airline_id === $pirep->airline_id) selected @endif>{{ $airline_label }}</option>
+                  @endforeach
+                </select>
               </div>
               <p class="text-danger">{{ $errors->first('airline_id') }}</p>
             @endif
           </div>
           <div class="col-sm-4">
-            {{ Form::label('flight_number', __('pireps.flightident')) }}
+            <label for="flight_number">@lang('pireps.flightident')</label>
             @if(!empty($pirep) && $pirep->read_only)
               <p>{{ $pirep->ident }}
-                {{ Form::hidden('flight_number') }}
-                {{ Form::hidden('flight_code') }}
-                {{ Form::hidden('flight_leg') }}
+                <input type="hidden" name="flight_number" value="{{ $pirep->flight_number }}" />
+                <input type="hidden" name="flight_code" value="{{ $pirep->flight_code }}" />
+                <input type="hidden" name="flight_leg" value="{{ $pirep->flight_leg }}" />
               </p>
             @else
               <div class="input-group input-group-sm mb3">
-                {{ Form::text('flight_number', null, [
-                    'placeholder' => __('flights.flightnumber'),
-                    'class' => 'form-control',
-                    'readonly' => (!empty($pirep) && $pirep->read_only),
-                ]) }}
-                &nbsp;
-                {{ Form::text('route_code', null, [
-                    'placeholder' => __('pireps.codeoptional'),
-                    'class' => 'form-control',
-                    'readonly' => (!empty($pirep) && $pirep->read_only),
-                ]) }}
-                &nbsp;
-                {{ Form::text('route_leg', null, [
-                    'placeholder' => __('pireps.legoptional'),
-                    'class' => 'form-control',
-                    'readonly' => (!empty($pirep) && $pirep->read_only),
-                ]) }}
+                <input
+                  type="text"
+                  name="flight_number"
+                  id="flight_number"
+                  class="form-control"
+                  @if(!empty($pirep) && $pirep->read_only) readonly @endif
+                  value="{{ !empty($pirep) ? $pirep->flight_number : old('flight_number') }}"
+                  placeholder="@lang('flights.flightnumber')"
+                />
+
+                <input
+                  type="text"
+                  name="route_code"
+                  id="route_code"
+                  class="form-control"
+                  @if(!empty($pirep) && $pirep->read_only) readonly @endif
+                  value="{{ !empty($pirep) ? $pirep->route_code : old('route_code') }}"
+                  placeholder="@lang('pireps.codeoptional')"
+                />
+
+                <input
+                  type="text"
+                  name="route_leg"
+                  id="route_leg"
+                  class="form-control"
+                  @if(!empty($pirep) && $pirep->route_leg) readonly @endif
+                  value="{{ !empty($pirep) ? $pirep->route_leg : old('route_leg') }}"
+                  placeholder="@lang('pireps.legoptional')"
+                />
               </div>
               <p class="text-danger">{{ $errors->first('flight_number') }}</p>
               <p class="text-danger">{{ $errors->first('route_code') }}</p>
@@ -75,19 +87,22 @@
             @endif
           </div>
           <div class="col-lg-4">
-            {{ Form::label('flight_type', __('flights.flighttype')) }}
+            <label for="flight_type">@lang('flights.flighttype')</label>
             @if(!empty($pirep) && $pirep->read_only)
               <p>{{ \App\Models\Enums\FlightType::label($pirep->flight_type) }}</p>
-              {{ Form::hidden('flight_type') }}
+              <input type="hidden" name="flight_type" value="{{ $pirep->flight_type }}" />
             @else
               <div class="form-group">
-                {{ Form::select('flight_type',
-                    \App\Models\Enums\FlightType::select(), null, [
-                        'class' => 'custom-select select2',
-                        'style' => 'width: 100%',
-                        'readonly' => (!empty($pirep) && $pirep->read_only),
-                    ])
-                }}
+                <select
+                  name="flight_type"
+                  id="flight_type"
+                  class="custom-select select2"
+                  style="width: 100%;"
+                >
+                  @foreach(\App\Models\Enums\FlightType::select() as $flight_type_id => $flight_type_label)
+                    <option value="{{ $flight_type_id }}" @if(!empty($pirep) && $pirep->flight_type == $flight_type_id) selected @endif>{{ $flight_type_label }}</option>
+                  @endforeach
+                </select>
               </div>
               <p class="text-danger">{{ $errors->first('flight_type') }}</p>
             @endif
@@ -96,46 +111,55 @@
 
         <div class="row">
           <div class="col-6">
-            {{ Form::label('hours', __('flights.flighttime')) }}
+            <label for="hours">@lang('flights.flighttime')</label>
             @if(!empty($pirep) && $pirep->read_only)
               <p>
                 {{ $pirep->hours.' '.trans_choice('common.hour', $pirep->hours) }}
                 , {{ $pirep->minutes.' '.trans_choice('common.minute', $pirep->minutes) }}
-                {{ Form::hidden('hours') }}
-                {{ Form::hidden('minutes') }}
+                <input type="hidden" name="hours" value="{{ $pirep->hours }}" />
+                <input type="hidden" name="minutes" value="{{ $pirep->minutes }}" />
               </p>
             @else
               <div class="input-group input-group-sm" style="max-width: 400px;">
-                {{ Form::number('hours', null, [
-                        'class' => 'form-control',
-                        'placeholder' => trans_choice('common.hour', 2),
-                        'min' => '0',
-                        'readonly' => (!empty($pirep) && $pirep->read_only),
-                ]) }}
+                <input type="number"
+                       name="hours"
+                       id="hours"
+                       class="form-control"
+                       @if(!empty($pirep) && $pirep->read_only) readonly @endif
+                       placeholder="{{ trans_choice('common.hour', 2) }}"
+                       min="0"
+                       value="{{ !empty($pirep) ? $pirep->hours : old('hours') }}"
+                />
 
-                {{ Form::number('minutes', null, [
-                    'class' => 'form-control',
-                    'placeholder' => trans_choice('common.minute', 2),
-                    'min' => 0,
-                    'readonly' => (!empty($pirep) && $pirep->read_only),
-                    ]) }}
+                <input type="number"
+                       name="minutes"
+                       id="minutes"
+                       class="form-control"
+                       @if(!empty($pirep) && $pirep->read_only) readonly @endif
+                       placeholder="{{ trans_choice('common.minute', 2) }}"
+                       min="0"
+                       value="{{ !empty($pirep) ? $pirep->minutes : old('minutes') }}"
+                />
               </div>
               <p class="text-danger">{{ $errors->first('hours') }}</p>
               <p class="text-danger">{{ $errors->first('minutes') }}</p>
             @endif
           </div>
           <div class="col-6">
-            {{ Form::label('level', __('flights.level')) }} ({{config('phpvms.internal_units.altitude')}})
+            <label for="level">@lang('flights.level') ({{config('phpvms.internal_units.altitude')}})</label>
             @if(!empty($pirep) && $pirep->read_only)
               <p>{{ $pirep->level }}</p>
             @else
               <div class="input-group input-group-sm form-group">
-                {{ Form::number('level', null, [
-                    'class' => 'form-control',
-                    'min' => '0',
-                    'step' => '0.01',
-                    'readonly' => (!empty($pirep) && $pirep->read_only),
-                    ]) }}
+                <input type="number"
+                       name="level"
+                       id="level"
+                       class="form-control"
+                       @if(!empty($pirep) && $pirep->read_only) readonly @endif
+                       min="0"
+                       step="0.01"
+                       value="{{ !empty($pirep) ? $pirep->level : old('level') }}"
+                />
               </div>
               <p class="text-danger">{{ $errors->first('level') }}</p>
             @endif
@@ -152,40 +176,50 @@
       <div class="form-container-body">
         <div class="row">
           <div class="col-6">
-            {{ Form::label('dpt_airport_id', __('airports.departure')) }}
-            @if(!empty($pirep) && $pirep->read_only)
+            <label for="dpt_airport_id">@lang('airports.departure')</label>
+            @if(!empty($pirep) && ($pirep->read_only || request()->has('flight_id')))
               {{ $pirep->dpt_airport->name }}
               (<a href="{{route('frontend.airports.show', [
                                     'id' => $pirep->dpt_airport->icao
                                     ])}}">{{$pirep->dpt_airport->icao}}</a>)
-              {{ Form::hidden('dpt_airport_id') }}
+              <input type="hidden" name="dpt_airport_id" value="{{ $pirep->dpt_airport_id }}" />
             @else
               <div class="form-group">
-                {{ Form::select('dpt_airport_id', $airport_list, null, [
-                        'class' => 'custom-select airport_search',
-                        'style' => 'width: 100%',
-                        'readonly' => (!empty($pirep) && $pirep->read_only),
-                ]) }}
+                <select
+                  name="dpt_airport_id"
+                  id="dpt_airport_id"
+                  class="custom-select airport_search"
+                  style="width: 100%"
+                >
+                  @foreach($airport_list as $dpt_airport_id => $dpt_airport_label)
+                    <option value="{{ $dpt_airport_id }}" @if(!empty($pirep) && $pirep->dpt_airport_id == $dpt_airport_id) selected @endif>{{ $dpt_airport_label }}</option>
+                  @endforeach
+                </select>
               </div>
               <p class="text-danger">{{ $errors->first('dpt_airport_id') }}</p>
             @endif
           </div>
 
           <div class="col-6">
-            {{ Form::label('arr_airport_id', __('airports.arrival')) }}
-            @if(!empty($pirep) && $pirep->read_only)
+            <label for="arr_airport_id">@lang('airports.arrival')</label>
+            @if(!empty($pirep) && ($pirep->read_only || request()->has('flight_id')))
               {{ $pirep->arr_airport->name }}
               (<a href="{{route('frontend.airports.show', [
                                     'id' => $pirep->arr_airport->icao
                                     ])}}">{{$pirep->arr_airport->icao}}</a>)
-              {{ Form::hidden('arr_airport_id') }}
+              <input type="hidden" name="arr_airport_id" value="{{ $pirep->arr_airport_id }}" />
             @else
               <div class="input-group input-group-sm form-group">
-                {{ Form::select('arr_airport_id', $airport_list, null, [
-                        'class' => 'custom-select airport_search',
-                        'style' => 'width: 100%',
-                        'readonly' => (!empty($pirep) && $pirep->read_only),
-                ]) }}
+                <select
+                  name="arr_airport_id"
+                  id="arr_airport_id"
+                  class="custom-select airport_search"
+                  style="width: 100%"
+                >
+                  @foreach($airport_list as $arr_airport_id => $arr_airport_label)
+                    <option value="{{ $arr_airport_id }}" @if(!empty($pirep) && $pirep->arr_airport_id == $arr_airport_id) selected @endif>{{ $arr_airport_label }}</option>
+                  @endforeach
+                </select>
               </div>
               <p class="text-danger">{{ $errors->first('arr_airport_id') }}</p>
             @endif
@@ -201,50 +235,68 @@
       <div class="form-container-body">
         <div class="row">
           <div class="col-4">
-            {{ Form::label('aircraft_id', __('common.aircraft')) }}
+            <label for="aircraft_id">@lang('common.aircraft')</label>
             @if(!empty($pirep) && $pirep->read_only)
               <p>{{ $pirep->aircraft->name }}</p>
-              {{ Form::hidden('aircraft_id') }}
+              <input type="hidden" name="aircraft_id" value="{{ $pirep->aircraft_id }}" />
             @else
               <div class="input-group input-group-sm form-group">
                 {{-- You probably don't want to change this ID if you want the fare select to work --}}
-                {{ Form::select('aircraft_id', $aircraft_list, null, [
-                    'id' => 'aircraft_select',
-                    'class' => 'custom-select select2',
-                    'readonly' => (!empty($pirep) && $pirep->read_only),
-                    ]) }}
+                <select
+                  name="aircraft_id"
+                  id="aircraft_select"
+                  class="custom-select select2"
+                >
+                  @foreach($aircraft_list as $subfleet => $sf_aircraft)
+                    @if ($subfleet === '')
+                      <option value=""></option>
+                    @else
+                      @foreach($sf_aircraft as $aircraft_id => $aircraft_label)
+                        <option value="{{ $aircraft_id }}" @if(!empty($pirep) && $pirep->aircraft_id == $aircraft_id) selected @endif>{{ $aircraft_label }}</option>
+                      @endforeach
+                    @endif
+                  @endforeach
+                </select>
               </div>
               <p class="text-danger">{{ $errors->first('aircraft_id') }}</p>
             @endif
           </div>
           <div class="col-4">
-            {{ Form::label('block_fuel', __('pireps.block_fuel')) }} ({{setting('units.fuel')}})
+            <label for="block_fuel">@lang('pireps.block_fuel') ({{setting('units.fuel')}})</label>
             @if(!empty($pirep) && $pirep->read_only)
               <p>{{ $pirep->block_fuel }}</p>
             @else
               <div class="input-group input-group-sm form-group">
-                {{ Form::number('block_fuel', null, [
-                    'class' => 'form-control',
-                    'min' => '0',
-                    'step' => '0.01',
-                    'readonly' => (!empty($pirep) && $pirep->read_only),
-                    ]) }}
+                <input
+                  type="number"
+                  name="block_fuel"
+                  id="block_fuel"
+                  class="form-control"
+                  min="0"
+                  step="0.01"
+                  @if(!empty($pirep) && $pirep->read_only) readonly @endif
+                  value="{{ !empty($pirep) ? $pirep->block_fuel : old('block_fuel') }}"
+                />
               </div>
               <p class="text-danger">{{ $errors->first('block_fuel') }}</p>
             @endif
           </div>
           <div class="col-4">
-            {{ Form::label('fuel_used', __('pireps.fuel_used')) }} ({{setting('units.fuel')}})
+            <label for="fuel_used">@lang('pireps.fuel_used') ({{ setting('units.fuel') }})</label>
             @if(!empty($pirep) && $pirep->read_only)
               <p>{{ $pirep->fuel_used }}</p>
             @else
               <div class="input-group input-group-sm form-group">
-                {{ Form::number('fuel_used', null, [
-                    'class' => 'form-control',
-                    'min' => '0',
-                    'step' => '0.01',
-                    'readonly' => (!empty($pirep) && $pirep->read_only),
-                    ]) }}
+                <input
+                  type="number"
+                  name="fuel_used"
+                  id="fuel_used"
+                  class="form-control"
+                  min="0"
+                  step="0.01"
+                  @if(!empty($pirep) && $pirep->read_only) readonly @endif
+                  value="{{ !empty($pirep) ? $pirep->fuel_used : old('fuel_used') }}"
+                />
               </div>
               <p class="text-danger">{{ $errors->first('fuel_used') }}</p>
             @endif
@@ -265,11 +317,7 @@
         <div class="row">
           <div class="col">
             <div class="input-group input-group-sm form-group">
-              {{ Form::textarea('route', null, [
-                  'class' => 'form-control',
-                  'placeholder' => __('flights.route'),
-                  'readonly' => (!empty($pirep) && $pirep->read_only),
-              ]) }}
+              <textarea name="route" id="route" placeholder="@lang('flights.route')" class="form-control">@if(!empty($pirep)){{ $pirep->route }}@else{{ old('route') }}@endif</textarea>
               <p class="text-danger">{{ $errors->first('route') }}</p>
             </div>
           </div>
@@ -285,7 +333,7 @@
         <div class="row">
           <div class="col">
             <div class="input-group input-group-sm form-group">
-              {{ Form::textarea('notes', null, ['class' => 'form-control', 'placeholder' => trans_choice('common.note', 2)]) }}
+              <textarea name="notes" id="notes" placeholder="{{ trans_choice('common.note', 2) }}" class="form-control">@if(!empty($pirep)){{ $pirep->notes }}@else{{ old('notes') }}@endif</textarea>
               <p class="text-danger">{{ $errors->first('notes') }}</p>
             </div>
           </div>
@@ -319,33 +367,23 @@
     <div class="float-right">
       <div class="form-group">
 
-        {{ Form::hidden('flight_id') }}
-        {{ Form::hidden('sb_id', $simbrief_id) }}
+        <input type="hidden" name="flight_id" value="{{ !empty($pirep) ? $pirep->flight_id : '' }}"/>
+        <input type="hidden" name="sb_id" value="{{ $simbrief_id }}"/>
 
         @if(isset($pirep) && !$pirep->read_only)
-          {{ Form::button(__('pireps.deletepirep'), [
-              'name' => 'submit',
-              'value' => 'Delete',
-              'class' => 'btn btn-warning',
-              'type' => 'submit',
-              'onclick' => "return confirm('Are you sure you want to delete this PIREP?')"])
-              }}
+          <button name="submit" type="submit" class="btn btn-warning" value="Delete" onclick="return confirm('Are you sure you want to delete this PIREP?')">
+            @lang('pireps.deletepirep')
+          </button>
         @endif
 
-        {{ Form::button(__('pireps.savepirep'), [
-                'name' => 'submit',
-                'value' => 'Save',
-                'class' => 'btn btn-info',
-                'type' => 'submit'])
-            }}
+        <button name="submit" type="submit" class="btn btn-info" value="Save">
+          @lang('pireps.savepirep')
+        </button>
 
         @if(!isset($pirep) || (filled($pirep) && !$pirep->read_only))
-          {{ Form::button(__('pireps.submitpirep'), [
-              'name' => 'submit',
-              'value' => 'Submit',
-              'class' => 'btn btn-success',
-              'type' => 'submit'])
-          }}
+          <button name="submit" type="submit" class="btn btn-success" value="Submit">
+            @lang('pireps.submitpirep')
+          </button>
         @endif
       </div>
     </div>
diff --git a/resources/views/layouts/default/profile/custom_fields.blade.php b/resources/views/layouts/default/profile/custom_fields.blade.php
index 1427ec68e..14761e83b 100644
--- a/resources/views/layouts/default/profile/custom_fields.blade.php
+++ b/resources/views/layouts/default/profile/custom_fields.blade.php
@@ -7,9 +7,7 @@
   </td>
   <td>
     <div class="input-group input-group-sm form-group">
-      {{ Form::text($field->field->slug, $field->value, [
-          'class' => 'form-control',
-          ]) }}
+      <input type="text" name="{{ $text->field->slug  }}" id="{{ $text->field->slug }}" class="form-control " value="{{ $field->value }}" />
     </div>
     <p class="text-danger">{{ $errors->first('field_'.$field->slug) }}</p>
   </td>
diff --git a/resources/views/layouts/default/profile/edit.blade.php b/resources/views/layouts/default/profile/edit.blade.php
index 699eab717..dba9ed2ce 100644
--- a/resources/views/layouts/default/profile/edit.blade.php
+++ b/resources/views/layouts/default/profile/edit.blade.php
@@ -6,9 +6,11 @@
     <div class="col-md-12">
       <h2 class="description">@lang('profile.edityourprofile')</h2>
       @include('flash::message')
-      {{ Form::model($user, ['route' => ['frontend.profile.update', $user->id], 'files' => true, 'method' => 'patch']) }}
-      @include("profile.fields")
-      {{ Form::close() }}
+      <form method="post" action="{{ route('frontend.profile.update', $user->id) }}" enctype="multipart/form-data">
+        @csrf
+        @method('PATCH')
+        @include("profile.fields")
+      </form>
     </div>
   </div>
 @endsection
diff --git a/resources/views/layouts/default/profile/fields.blade.php b/resources/views/layouts/default/profile/fields.blade.php
index 154a9f4b5..fbf9b7041 100644
--- a/resources/views/layouts/default/profile/fields.blade.php
+++ b/resources/views/layouts/default/profile/fields.blade.php
@@ -5,7 +5,7 @@
         <td>{{ __('common.name') }}</td>
         <td>
           <div class="input-group form-group-no-border{{ $errors->has('name') ? ' has-danger' : '' }}">
-            {{ Form::text('name', null, ['class' => 'form-control']) }}
+            <input type="text" name="name" id="name" class="form-control" value="{{ $user->name }}" />
           </div>
           @if ($errors->has('name'))
             <p class="text-danger">{{ $errors->first('name') }}</p>
@@ -17,7 +17,7 @@
         <td>{{ __('common.email') }}</td>
         <td>
           <div class="input-group form-group-no-border{{ $errors->has('email') ? ' has-danger' : '' }}">
-            {{ Form::text('email', null, ['class' => 'form-control']) }}
+            <input type="email" name="email" id="email" class="form-control" value="{{ $user->email }}" />
           </div>
           @if ($errors->has('email'))
             <p class="text-danger">{{ $errors->first('email') }}</p>
@@ -29,7 +29,11 @@
         <td>{{ __('common.airline') }}</td>
         <td>
           <div class="input-group form-group-no-border{{ $errors->has('airline') ? ' has-danger' : '' }}">
-            {{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
+            <select name="airline_id" id="airline_id" class="form-control select2">
+              @foreach($airlines as $airline_id => $airline_label)
+                <option value="{{ $airline_id }}" @if($user->airline_id === $airline_id) selected @endif>{{ $airline_label }}</option>
+              @endforeach
+            </select>
           </div>
           @if ($errors->has('airline_id'))
             <p class="text-danger">{{ $errors->first('airline_id') }}</p>
@@ -41,7 +45,11 @@
         <td>{{ __('airports.home') }}</td>
         <td>
           <div class="input-group form-group-no-border{{ $errors->has('home_airport_id') ? ' has-danger' : '' }}">
-            {{ Form::select('home_airport_id', $airports, null , ['class' => 'form-control airport_search '.($hubs_only?'hubs_only':'')]) }}
+            <select name="home_airport_id" id="home_airport_id" class="form-control airport_search @if($hubs_only) hubs_only @endif">
+              @foreach($airports as $airport_id => $airport_label)
+                <option value="{{ $airport_id }}">{{ $airport_label }}</option>
+              @endforeach
+            </select>
           </div>
           @if ($errors->has('home_airport_id'))
             <p class="text-danger">{{ $errors->first('home_airport_id') }}</p>
@@ -53,7 +61,11 @@
         <td>{{ __('common.country') }}</td>
         <td>
           <div class="input-group form-group-no-border{{ $errors->has('country') ? ' has-danger' : '' }}">
-            {{ Form::select('country', $countries, null, ['class' => 'form-control select2' ]) }}
+            <select name="country" id="country" class="form-control select2">
+              @foreach($countries as $country_id => $country_label)
+                <option value="{{ $country_id }}" @if($user->country === $country_id) selected @endif>{{ $country_label }}</option>
+              @endforeach
+            </select>
           </div>
           @if ($errors->has('country'))
             <p class="text-danger">{{ $errors->first('country') }}</p>
@@ -65,7 +77,15 @@
         <td>{{ __('common.timezone') }}</td>
         <td>
           <div class="input-group form-group-no-border{{ $errors->has('timezone') ? ' has-danger' : '' }}">
-            {{ Form::select('timezone', $timezones, null, ['class' => 'form-control select2' ]) }}
+            <select name="timezone" id="timezone" class="form-control select2">}
+              @foreach($timezones as $group_name => $group_timezones)
+                <optgroup label="{{ $group_name }}">
+                  @foreach($group_timezones as $timezone_id => $timezone_label)
+                    <option value="{{ $timezone_id }}" @if($timezone_id === $user->timezone) selected @endif>{{ $timezone_label }}</option>
+                  @endforeach
+                </optgroup>
+              @endforeach
+            </select>
           </div>
           @if ($errors->has('timezone'))
             <p class="text-danger">{{ $errors->first('timezone') }}</p>
@@ -78,7 +98,7 @@
         <td>
           <p>{{ __('profile.newpassword') }}:</p>
           <div class="input-group form-group-no-border{{ $errors->has('password') ? ' has-danger' : '' }}">
-            {{ Form::password('password', ['class' => 'form-control']) }}
+            <input type="password" name="password" id="password" class="form-control" />
           </div>
           @if ($errors->has('password'))
             <p class="text-danger">{{ $errors->first('password') }}</p>
@@ -86,7 +106,7 @@
 
           <p>{{ __('passwords.confirm') }}:</p>
           <div class="input-group form-group-no-border{{ $errors->has('password_confirmation') ? ' has-danger' : '' }}">
-            {{ Form::password('password_confirmation', ['class' => 'form-control']) }}
+            <input type="password" name="password_confirmation" id="password_confirmation" class="form-control" />
           </div>
           @if ($errors->has('password_confirmation'))
             <p class="text-danger">{{ $errors->first('password_confirmation') }}</p>
@@ -97,7 +117,7 @@
         <td>{{ __('profile.avatar') }}</td>
         <td>
           <div class="input-group form-group-no-border{{ $errors->has('avatar') ? ' has-danger' : '' }}">
-            {{ Form::file('avatar', null) }}
+            <input type="file" name="avatar" id="avatar" />
           </div>
           <p class="small">{{ __('profile.avatarresize', [
                         'width' => config('phpvms.avatar.width'),
@@ -120,9 +140,7 @@
           </td>
           <td>
             <div class="input-group input-group-sm form-group">
-              {{ Form::text('field_'.$field->slug, $field->value, [
-                  'class' => 'form-control',
-                  ]) }}
+              <input type="text" name="field_{{ $field->slug }}" id="field_{{ $field->slug }}" class="form-control" value="{{ $field->value }}" />
             </div>
             <p class="text-danger">{{ $errors->first('field_'.$field->slug) }}</p>
           </td>
@@ -133,8 +151,8 @@
         <td>{{ __('profile.opt-in') }}</td>
         <td>
           <div class="input-group form-group-no-border">
-            {{ Form::hidden('opt_in', 0, false) }}
-            {{ Form::checkbox('opt_in', 1, null) }}
+            <input type="hidden" name="opt_in" value="0" />
+            <input type="checkbox" name="opt_in" id="opt_in" checked="{{ $user->opt_in }}" />
           </div>
           <p class="small">{{ __('profile.opt-in-descrip') }}
           </p>
@@ -144,7 +162,9 @@
     </table>
 
     <div style="width: 100%; text-align: right; padding-top: 20px;">
-      {{ Form::submit(__('profile.updateprofile'), ['class' => 'btn btn-primary']) }}
+      <button type="submit" class="btn btn-primary">
+        @lang('profile.updateprofile')
+      </button>
     </div>
   </div>
 </div>