diff --git a/app/Http/Controllers/MigrationController.php b/app/Http/Controllers/MigrationController.php
index f47f43349b9c..b27639cba6c5 100644
--- a/app/Http/Controllers/MigrationController.php
+++ b/app/Http/Controllers/MigrationController.php
@@ -80,7 +80,7 @@ class MigrationController extends BaseController
     public function purgeCompany(Company $company)
     {
        
-       $company->delete();
+            $company->delete();
 
             return response()->json(['message'=>'Company purged'], 200);
     }
@@ -133,8 +133,8 @@ class MigrationController extends BaseController
      */
     public function purgeCompanySaveSettings(Company $company)
     {
-        $company->client->delete()
-        $company->save()
+        $company->client->delete();
+        $company->save();
 
             return response()->json(['message'=>'Setting preserved'], 200);
 
diff --git a/app/Models/Company.php b/app/Models/Company.php
index 2e75076b26b2..d5b6a56baf91 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -30,6 +30,7 @@ use App\Models\TaxRate;
 use App\Models\Timezone;
 use App\Models\Traits\AccountTrait;
 use App\Models\User;
+use App\Utils\Ninja;
 use App\Utils\Traits\CompanySettingsSaver;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Database\Eloquent\Model;
@@ -246,4 +247,49 @@ class Company extends BaseModel
         return $this
             ->where('id', $this->decodePrimaryKey($value))->firstOrFail();
     }
+
+
+    private function isThrottled()
+    {
+        if (Ninja::isSelfHost()) {
+            return false;
+        }
+
+        $key = $this->id;
+
+        // http://stackoverflow.com/questions/1375501/how-do-i-throttle-my-sites-api-users
+        $day = 60 * 60 * 24;
+        $day_limit = $account->getDailyEmailLimit();
+        $day_throttle = Cache::get("email_day_throttle:{$key}", null);
+        $last_api_request = Cache::get("last_email_request:{$key}", 0);
+        $last_api_diff = time() - $last_api_request;
+
+        if (is_null($day_throttle)) {
+            $new_day_throttle = 0;
+        } else {
+            $new_day_throttle = $day_throttle - $last_api_diff;
+            $new_day_throttle = $new_day_throttle < 0 ? 0 : $new_day_throttle;
+            $new_day_throttle += $day / $day_limit;
+            $day_hits_remaining = floor(($day - $new_day_throttle) * $day_limit / $day);
+            $day_hits_remaining = $day_hits_remaining >= 0 ? $day_hits_remaining : 0;
+        }
+
+        Cache::put("email_day_throttle:{$key}", $new_day_throttle, 60);
+        Cache::put("last_email_request:{$key}", time(), 60);
+
+        if ($new_day_throttle > $day) {
+            $errorEmail = env('ERROR_EMAIL');
+            if ($errorEmail && ! Cache::get("throttle_notified:{$key}")) {
+                Mail::raw('Account Throttle: ' . $account->account_key, function ($message) use ($errorEmail, $account) {
+                    $message->to($errorEmail)
+                            ->from(CONTACT_EMAIL)
+                            ->subject("Email throttle triggered for account " . $account->id);
+                });
+            }
+            Cache::put("throttle_notified:{$key}", true, 60 * 24);
+            return true;
+        }
+
+        return false;
+    }
 }
diff --git a/database/migrations/2014_10_13_000000_create_users_table.php b/database/migrations/2014_10_13_000000_create_users_table.php
index f9f10a069d1b..091bec5ab96e 100644
--- a/database/migrations/2014_10_13_000000_create_users_table.php
+++ b/database/migrations/2014_10_13_000000_create_users_table.php
@@ -198,7 +198,7 @@ class CreateUsersTable extends Migration
 
             $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
             $table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
-            $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
+          //  $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
 
             $table->index(['account_id', 'company_id']);
 
@@ -259,7 +259,7 @@ class CreateUsersTable extends Migration
 
             $table->unique(['oauth_user_id', 'oauth_provider_id']);
 
-            $table->foreign('user_id')->references('user_id')->on('company_users')->onDelete('cascade');
+           // $table->foreign('user_id')->references('user_id')->on('company_users')->onDelete('cascade');
 
         });