diff --git a/database/migrations/2017_06_08_0000_create_users_table.php b/database/migrations/2017_06_08_0000_create_users_table.php
index 4c37398d..4b44fab3 100755
--- a/database/migrations/2017_06_08_0000_create_users_table.php
+++ b/database/migrations/2017_06_08_0000_create_users_table.php
@@ -19,8 +19,8 @@ class CreateUsersTable extends Migration
             $table->string('email')->unique();
             $table->string('password');
             $table->string('apikey', 40)->nullable();
-            $table->unsignedInteger('airline_id')->unsigned();
-            $table->unsignedInteger('rank_id')->unsigned();
+            $table->unsignedInteger('airline_id');
+            $table->unsignedInteger('rank_id');
             $table->string('home_airport_id', 5)->nullable();
             $table->string('curr_airport_id', 5)->nullable();
             $table->string('last_pirep_id', 12)->nullable();
diff --git a/database/seeds/dev.yml b/database/seeds/dev.yml
index 086f3ce4..5f1ecdf1 100644
--- a/database/seeds/dev.yml
+++ b/database/seeds/dev.yml
@@ -1,11 +1,20 @@
 #
+airlines:
+  - id: 1
+    icao: VMS
+    iata: VM
+    name: phpvms airlines
+    active: 1
+    created_at: now
+    updated_at: now
+
 users:
   - id: 1
     name: Admin User
     email: admin@phpvms.net
     password: admin
-    rank_id: 1
     airline_id: 1
+    rank_id: 1
     home_airport_id: KAUS
     curr_airport_id: KJFK
     flights: 1
@@ -17,8 +26,8 @@ users:
     name: Carla Walters
     email: carla.walters68@example.com
     password: admin
-    rank_id: 1
     airline_id: 1
+    rank_id: 1
     home_airport_id: KJFK
     curr_airport_id: KJFK
     flights: 1
@@ -30,8 +39,8 @@ users:
     name: Raymond Pearson
     email: raymond.pearson56@example.com
     password: admin
-    rank_id: 1
     airline_id: 1
+    rank_id: 1
     home_airport_id: KJFK
     curr_airport_id: KAUS
     flights: 1
@@ -70,15 +79,6 @@ ranks:
     auto_approve_manual: 1
     auto_promote: 0
 
-airlines:
-  - id: 1
-    icao: VMS
-    iata: VM
-    name: phpvms airlines
-    active: 1
-    created_at: now
-    updated_at: now
-
 airports:
   - id: KAUS
     iata: AUS
diff --git a/tests/data/base.yml b/tests/data/base.yml
index 9c87aa84..4464744c 100644
--- a/tests/data/base.yml
+++ b/tests/data/base.yml
@@ -14,6 +14,7 @@ users:
     email: admin@phpvms.net
     password: admin
     apikey: testapikey
+    airline_id: 1
     rank_id: 1
     created_at: now
     updated_at: now