diff --git a/app/Http/Controllers/Auth/ContactForgotPasswordController.php b/app/Http/Controllers/Auth/ContactForgotPasswordController.php
index b6338633c775..184d09475c2b 100644
--- a/app/Http/Controllers/Auth/ContactForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ContactForgotPasswordController.php
@@ -58,7 +58,7 @@ class ContactForgotPasswordController extends Controller
      */
     public function showLinkRequestForm(Request $request)
     {
-        $account_id = $request->get('account_id');
+        $account_id = $request->has('account_id') ? $request->get('account_id') : 1;
         $account = Account::find($account_id);
         $company = $account->companies->first();
 
diff --git a/app/Http/Controllers/Auth/ContactResetPasswordController.php b/app/Http/Controllers/Auth/ContactResetPasswordController.php
index 7c32d664a1f0..f5a981ae1859 100644
--- a/app/Http/Controllers/Auth/ContactResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ContactResetPasswordController.php
@@ -68,7 +68,7 @@ class ContactResetPasswordController extends Controller
      */
     public function showResetForm(Request $request, $token = null)
     {
-        $account_id = $request->get('account_id');
+        $account_id = $request->has('account_id') ? $request->get('account_id') : 1;
         $account = Account::find($account_id);
         $db = $account->companies->first()->db;
         $company = $account->companies->first();
diff --git a/app/PaymentDrivers/WePayPaymentDriver.php b/app/PaymentDrivers/WePayPaymentDriver.php
index 9624a329cf03..73b8d7573949 100644
--- a/app/PaymentDrivers/WePayPaymentDriver.php
+++ b/app/PaymentDrivers/WePayPaymentDriver.php
@@ -208,8 +208,8 @@ class WePayPaymentDriver extends BaseDriver
 
             return 'Processed successfully';
         } elseif ($objectType == 'account') {
-            if ($accountId != $objectId) {
-                throw new \Exception('Unknown account');
+            if ($accountId !== $objectId) {
+                throw new \Exception('Unknown account ' . $accountId . ' does not equal '.$objectId);
             }
 
             $wepayAccount = $this->wepay->request('account', array(