diff --git a/app/Database/migrations/2017_06_11_135707_create_airports_table.php b/app/Database/migrations/2017_06_11_135707_create_airports_table.php
index df551639..1a53426e 100644
--- a/app/Database/migrations/2017_06_11_135707_create_airports_table.php
+++ b/app/Database/migrations/2017_06_11_135707_create_airports_table.php
@@ -15,7 +15,7 @@ class CreateAirportsTable extends Migration
             $table->string('location', 100)->nullable();
             $table->string('country', 64)->nullable();
             $table->string('tz', 64)->nullable();
-            $table->boolean('hub')->default(true);
+            $table->boolean('hub')->default(false);
             $table->unsignedDecimal('fuel_100ll_cost', 19)->default(0);
             $table->unsignedDecimal('fuel_jeta_cost', 19)->default(0);
             $table->unsignedDecimal('fuel_mogas_cost', 19)->default(0);
diff --git a/app/Database/seeds/dev.yml b/app/Database/seeds/dev.yml
index 55836add..fab538a3 100644
--- a/app/Database/seeds/dev.yml
+++ b/app/Database/seeds/dev.yml
@@ -12,4 +12,5 @@ airports:
     country: United States
     lat: 30.1945278
     lon: -97.6698889
+    hub: 1
     tz: America/Chicago
diff --git a/app/Database/seeds/prod.yml b/app/Database/seeds/prod.yml
index 55836add..fab538a3 100644
--- a/app/Database/seeds/prod.yml
+++ b/app/Database/seeds/prod.yml
@@ -12,4 +12,5 @@ airports:
     country: United States
     lat: 30.1945278
     lon: -97.6698889
+    hub: 1
     tz: America/Chicago
diff --git a/app/Database/seeds/sample.yml b/app/Database/seeds/sample.yml
index df76b459..a1740c72 100644
--- a/app/Database/seeds/sample.yml
+++ b/app/Database/seeds/sample.yml
@@ -94,6 +94,7 @@ airports:
     country: United States
     lat: 30.1945278
     lon: -97.6698889
+    hub: 1
     tz: America/Chicago
   - id: KJFK
     iata: JFK
@@ -103,6 +104,7 @@ airports:
     country: United States
     lat: 40.6399257
     lon: -73.7786950
+    hub: 1
     tz: America/New_York
   - id: KBWI
     iata: BWI
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 71ebd398..442cbbc7 100755
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -48,7 +48,7 @@ class RegisterController extends Controller
 
     public function showRegistrationForm()
     {
-        $airports = $this->airportRepo->selectBoxList();
+        $airports = $this->airportRepo->selectBoxList(false, true);
         $airlines = $this->airlineRepo->selectBoxList();
 
         return $this->view('auth.register', [
diff --git a/app/Repositories/AirportRepository.php b/app/Repositories/AirportRepository.php
index e31a70b8..051e5444 100644
--- a/app/Repositories/AirportRepository.php
+++ b/app/Repositories/AirportRepository.php
@@ -25,10 +25,16 @@ class AirportRepository extends BaseRepository implements CacheableInterface
      * Return the list of airports formatted for a select box
      * @return array
      */
-    public function selectBoxList($add_blank=false): array
+    public function selectBoxList($add_blank=false, $only_hubs=false): array
     {
         $retval = [];
-        $items = $this->orderBy('icao', 'asc')->all();
+        $where = [];
+
+        if($only_hubs) {
+            $where['hub'] = 1;
+        }
+
+        $items = $this->orderBy('icao', 'asc')->findWhere($where);
 
         if ($add_blank) {
             $retval[''] = '';
diff --git a/resources/views/admin/airports/fields.blade.php b/resources/views/admin/airports/fields.blade.php
index 15b67428..b46359cd 100644
--- a/resources/views/admin/airports/fields.blade.php
+++ b/resources/views/admin/airports/fields.blade.php
@@ -42,15 +42,21 @@
     </div>
 
     <div class="row">
-        <div class="form-group col-sm-6">
+        <div class="form-group col-sm-4">
             {!! Form::label('lat', 'Latitude:') !!}
             {!! Form::number('lat', null, ['class' => 'form-control', 'step' => '0.000001', 'rv-value' => 'airport.lat']) !!}
         </div>
 
-        <div class="form-group col-sm-6">
+        <div class="form-group col-sm-4">
             {!! Form::label('lon', 'Longitude:') !!}
             {!! Form::number('lon', null, ['class' => 'form-control', 'step' => '0.000001', 'rv-value' => 'airport.lon']) !!}
         </div>
+
+        <div class="form-group col-sm-4">
+            {!! Form::label('hub', 'Hub:') !!}
+            {!! Form::hidden('hub', 0)  !!}
+            {!! Form::checkbox('hub', null) !!}
+        </div>
     </div>
 
     <div class="row">
diff --git a/resources/views/admin/airports/table.blade.php b/resources/views/admin/airports/table.blade.php
index 0301af9b..4587cd55 100644
--- a/resources/views/admin/airports/table.blade.php
+++ b/resources/views/admin/airports/table.blade.php
@@ -4,7 +4,7 @@
             <th>ICAO</th>
             <th>Name</th>
             <th>Location</th>
-            <th>Timezone</th>
+            <th>Hub</th>
             <th style="text-align: center;">100LL</th>
             <th style="text-align: center;">JetA</th>
             <th style="text-align: center;">MOGAS</th>
@@ -16,7 +16,11 @@
                 <td><a href="{!! route('admin.airports.edit', [$airport->id]) !!}">{!! $airport->icao !!}</a></td>
                 <td>{!! $airport->name !!}</td>
                 <td>{!! $airport->location !!}</td>
-                <td>{!! $airport->timezone !!}</td>
+                <td style="text-align: center;">
+                    @if($airport->hub == 1)
+                        <span class="label label-success">Hub</span>
+                    @endif
+                </td>
                 <td style="text-align: center;">
                     <a class="inline" href="#" data-pk="{!! $airport->id !!}" data-name="fuel_100ll_cost">{!! $airport->fuel_100ll_cost !!}</a>
                 </td>
diff --git a/resources/views/layouts/default/auth/register.blade.php b/resources/views/layouts/default/auth/register.blade.php
index 63cc8a5c..d87c54d4 100644
--- a/resources/views/layouts/default/auth/register.blade.php
+++ b/resources/views/layouts/default/auth/register.blade.php
@@ -36,7 +36,7 @@
 
             <label for="home_airport" class="control-label">Home Airport</label>
             <div class="input-group form-group-no-border{{ $errors->has('home_airport') ? ' has-danger' : '' }}">
-                {!! Form::select('home_airport_id', $airlines, null , ['class' => 'form-control select2']) !!}
+                {!! Form::select('home_airport_id', $airports, null , ['class' => 'form-control select2']) !!}
             </div>
             @if ($errors->has('home_airport_id'))
             <p class="text-danger">{{ $errors->first('home_airport_id') }}</p>