diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 8864eb6fc9..697dd36283 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -380,7 +380,7 @@ class UserController extends BaseController
      */
     public function update(UpdateUserRequest $request, User $user)
     {
-        $old_company_user = $user->company_user();
+        $old_company_user = $user->company_user;
         $old_user = json_encode($user);
         $old_user_email = $user->getOriginal('email');
 
@@ -398,8 +398,8 @@ class UserController extends BaseController
         
         
         if(
-            strcasecmp($old_company_user->permissions, $user->company_user()->permissions) != 0 ||
-            $old_company_user->is_admin != $user->company_user()->is_admin
+            strcasecmp($old_company_user->permissions, $user->company_user->permissions) != 0 ||
+            $old_company_user->is_admin != $user->company_user->is_admin
           ){
             $user->company_user()->update(["permissions_updated_at" => now()]);
         }
diff --git a/app/Models/BaseModel.php b/app/Models/BaseModel.php
index d1e8c8ce60..a1563c8939 100644
--- a/app/Models/BaseModel.php
+++ b/app/Models/BaseModel.php
@@ -21,6 +21,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\ModelNotFoundException as ModelNotFoundException;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
 
 
 /**
@@ -189,7 +190,7 @@ class BaseModel extends Model
 
     public function numberFormatter()
     {
-        $number = strlen($this->number) > 1 ? $this->number : class_basename($this);
+        $number = strlen($this->number) >= 1 ? $this->number : class_basename($this) . "_" . Str::random(5); ;
 
         $formatted_number =  mb_ereg_replace("([^\w\s\d\-_~,;\[\]\(\).])", '', $number);
         // Remove any runs of periods (thanks falstro!)
diff --git a/app/PaymentDrivers/Stripe/UpdatePaymentMethods.php b/app/PaymentDrivers/Stripe/UpdatePaymentMethods.php
index d3b9e974e2..205d4fbae0 100644
--- a/app/PaymentDrivers/Stripe/UpdatePaymentMethods.php
+++ b/app/PaymentDrivers/Stripe/UpdatePaymentMethods.php
@@ -107,7 +107,7 @@ class UpdatePaymentMethods
                 $additional_data = ['gateway_customer_reference' => $customer->id];
 
                 if($customer->default_source === $method->id)
-                    $additional_data = ['gateway_customer_reference' => $customer->id, 'is_default', 1];
+                    $additional_data = ['gateway_customer_reference' => $customer->id, 'is_default' => 1];
 
                 $this->stripe->storeGatewayToken($data, $additional_data);