diff --git a/app/Services/FlightService.php b/app/Services/FlightService.php
index cdf24ae5..3a65d3b2 100644
--- a/app/Services/FlightService.php
+++ b/app/Services/FlightService.php
@@ -20,9 +20,9 @@ class FlightService extends BaseService
      * Allow a user to bid on a flight. Check settings and all that good stuff
      * @param Flight $flight
      * @param User $user
-     * @return UserBid
+     * @return UserBid|null
      */
-    public function addBid(Flight $flight, User $user): UserBid
+    public function addBid(Flight $flight, User $user)
     {
         # If it's already been bid on, then it can't be bid on again
         if($flight->has_bid && setting('bids.disable_flight_on_bid')) {
@@ -74,7 +74,10 @@ class FlightService extends BaseService
             $user_bid->forceDelete();
         }
 
-        $flight->has_bid = false;
-        $flight->save();
+        # Only flip the flag if there are no bids left for this flight
+        if(!UserBid::where('flight_id', $flight->id)->exists()) {
+            $flight->has_bid = false;
+            $flight->save();
+        }
     }
 }
diff --git a/phpvms.iml b/phpvms.iml
index 34e6cb40..8b7db6af 100644
--- a/phpvms.iml
+++ b/phpvms.iml
@@ -306,19 +306,6 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="PHARS">
-        <CLASSES>
-          <root url="phar://$MODULE_DIR$/vendor/phar-io/manifest/tests/_fixture/test.phar/" />
-          <root url="phar://$MODULE_DIR$/vendor/phpunit/phpunit/tests/_files/phpunit-example-extension/tools/phpunit.d/phpunit-example-extension-1.0.1.phar/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="phar://$MODULE_DIR$/vendor/phar-io/manifest/tests/_fixture/test.phar/" />
-          <root url="phar://$MODULE_DIR$/vendor/phpunit/phpunit/tests/_files/phpunit-example-extension/tools/phpunit.d/phpunit-example-extension-1.0.1.phar/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
   </component>
   <component name="TemplatesService">
     <option name="TEMPLATE_FOLDERS">
diff --git a/tests/FlightTest.php b/tests/FlightTest.php
index b4ad1b81..baab9845 100644
--- a/tests/FlightTest.php
+++ b/tests/FlightTest.php
@@ -114,4 +114,24 @@ class FlightTest extends TestCase
 
         $this->assertEquals(0, sizeof($body));
     }
+
+    /**
+     *
+     */
+    public function testMultipleBidsSingleFlight()
+    {
+        setting('bids.disable_flight_on_bid', true);
+
+        $user1 = User::find(1);
+        $user2 = User::find(2);
+
+        $flight_id = $this->addFlight();
+        $flight = Flight::find($flight_id);
+
+        # Put bid on the flight to block it off
+        $bid = $this->flightSvc->addBid($flight, $user1);
+
+        $bidRepeat = $this->flightSvc->addBid($flight, $user2);
+        $this->assertNull($bidRepeat);
+    }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 59e93009..bc4186cb 100755
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -19,7 +19,7 @@ abstract class TestCase extends Illuminate\Foundation\Testing\TestCase
     protected $connectionsToTransact = ['testing'];
 
     protected static $auth_headers = [
-        'Authorization' => 'testapikey'
+        'Authorization' => 'testadminapikey'
     ];
 
     public function __construct($name = null, array $data = [], $dataName = '') {
diff --git a/tests/data/base.yml b/tests/data/base.yml
index c8bf22ba..90860cc3 100644
--- a/tests/data/base.yml
+++ b/tests/data/base.yml
@@ -13,19 +13,32 @@ users:
     name: Admin User
     email: admin@phpvms.net
     password: admin
-    api_key: testapikey
+    api_key: testadminapikey
     airline_id: 1
     home_airport_id: KAUS
     curr_airport_id: KAUS
     rank_id: 1
     created_at: now
     updated_at: now
+  - id: 2
+    name: Test User
+    email: test@phpvms.net
+    password: test
+    api_key: testuserapikey
+    airline_id: 1
+    home_airport_id: KJFK
+    curr_airport_id: KJFK
+    rank_id: 1
+    created_at: now
+    updated_at: now
 
 role_user:
   - user_id: 1
     role_id: 1
   - user_id: 1
     role_id: 2
+  - user_id: 2
+    role_id: 2
 
 ranks:
   - id: 1