diff --git a/app/Console/Commands/SupplierAccountSync.php b/app/Console/Commands/SupplierAccountSync.php
index 601a98e..ef9cd8d 100644
--- a/app/Console/Commands/SupplierAccountSync.php
+++ b/app/Console/Commands/SupplierAccountSync.php
@@ -10,32 +10,39 @@ use App\Models\{Site,Supplier,User};
 
 class SupplierAccountSync extends Command
 {
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'supplier:account:sync'
-		.' {siteid : Site ID}'
+	/**
+	 * The name and signature of the console command.
+	 *
+	 * @var string
+	 */
+	protected $signature = 'supplier:account:sync'
 		.' {supplier : Supplier Name}'
-		.' {--f|forceprod : Force Prod API on dev environment}';
+		.' {--f|forceprod : Force Prod API on dev environment}'
+		.' {--s|site : Site ID}';
 
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Sync accounts with a supplier';
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Sync accounts with a supplier';
 
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     */
-    public function handle()
-    {
-		Config::set('site',Site::findOrFail($this->argument('siteid')));
-		$so = Supplier::where('name',$this->argument('supplier'))->singleOrFail();
+	/**
+	 * Execute the console command.
+	 *
+	 * @return int
+	 * @note Suppliers are now associated with accounts, so this needs to be updated
+	 */
+	public function handle()
+	{
+		Config::set(
+			'site',
+			$this->option('site')
+				? Site::findOrFail($this->option('site'))
+				: Site::where('url',config('app.url'))->sole()
+		);
+
+		$so = Supplier::where('name','ilike',strtolower($this->argument('supplier')))->sole();
 
 		foreach ($so->API($this->option('forceprod'))->getCustomers(['fetchall'=>true]) as $customer) {
 			// Check if we have this customer already (by ID)
@@ -43,7 +50,6 @@ class SupplierAccountSync extends Command
 				$this->info(sprintf('User already linked (%s:%s)',$customer->id,$customer->email));
 
 			} elseif ($x=User::where('email',$customer->email)->single()) {
-				//dump($x->suppliers->first());
 				if ($x->suppliers->count()) {
 					$this->alert(sprintf('User [%d:%s] already linked to this supplier with ID (%s)',$customer->id,$customer->email,$x->suppliers->first()->pivot->id));
 
@@ -63,5 +69,7 @@ class SupplierAccountSync extends Command
 				$this->error(sprintf('User doesnt exist with email (%s:%s)',$customer->id,$customer->email));
 			}
 		}
-    }
+
+		return self::SUCCESS;
+	}
 }
\ No newline at end of file
diff --git a/app/Console/Commands/SupplierDomainSync.php b/app/Console/Commands/SupplierDomainSync.php
index a1d91bc..fd8d47b 100644
--- a/app/Console/Commands/SupplierDomainSync.php
+++ b/app/Console/Commands/SupplierDomainSync.php
@@ -3,9 +3,10 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Config;
 
-use App\Models\{Site,Supplier};
 use App\Jobs\SupplierDomainSync as Job;
+use App\Models\{Site,Supplier};
 
 class SupplierDomainSync extends Command
 {
@@ -15,9 +16,9 @@ class SupplierDomainSync extends Command
 	 * @var string
 	 */
 	protected $signature = 'supplier:domain:sync'
-	.' {siteid : Site ID}'
-	.' {supplier : Supplier Name}'
-	.' {--f|forceprod : Force Prod API on dev environment}';
+		.' {supplier : Supplier Name}'
+		.' {--f|forceprod : Force Prod API on dev environment}'
+		.' {--s|site : Site ID}';
 
 	/**
 	 * The console command description.
@@ -33,8 +34,15 @@ class SupplierDomainSync extends Command
 	 */
 	public function handle()
 	{
+		Config::set(
+			'site',
+			($x=$this->option('site')
+				? Site::findOrFail($this->option('site'))
+				: Site::where('url',config('app.url'))->sole())
+		);
+
 		$so = Supplier::where('name',$this->argument('supplier'))->singleOrFail();
 
-		Job::dispatchSync(Site::findOrFail($this->argument('siteid')),$so,$this->option('forceprod'));
+		return Job::dispatchSync($x,$so,$this->option('forceprod'));
 	}
 }
\ No newline at end of file