diff --git a/.gitignore b/.gitignore
index 7f33223..63be67b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 modules/servers/solusvmpro/.idea
 modules/servers/solusvmpro/callback.php
 modules/servers/solusvmpro/configure.ini
-modules/servers/solusvmpro/custom.php
\ No newline at end of file
+modules/servers/solusvmpro/custom.php
+.idea
diff --git a/modules/servers/solusvmpro/console.php b/modules/servers/solusvmpro/console.php
index f431a3f..94c4973 100644
--- a/modules/servers/solusvmpro/console.php
+++ b/modules/servers/solusvmpro/console.php
@@ -7,6 +7,7 @@
 require_once __DIR__ . '/lib/CaseInsensitiveArray.php';
 require_once __DIR__ . '/lib/SolusVM.php';
 
+use Composer\Semver\Comparator;
 use Illuminate\Database\Capsule\Manager as Capsule;
 use SolusVM\SolusVM;
 
@@ -33,7 +34,12 @@
     }
     $uid = (int)$_GET['uid'];
 }else{
+    // Adding this to workaround CORE-15619 WHMCS bug
+    $whmcsVersion = $CONFIG['Version'];
     $uid = $ca->getUserID();
+    if (Comparator::greaterThanOrEqualTo($whmcsVersion,'8')) {
+        $uid = Auth::client()->id;
+    }
 }
 $servid = (int) $_GET['id'];
 if ( $servid == "" ) {
diff --git a/modules/servers/solusvmpro/get_client_data.php b/modules/servers/solusvmpro/get_client_data.php
index c2b4825..b76f950 100644
--- a/modules/servers/solusvmpro/get_client_data.php
+++ b/modules/servers/solusvmpro/get_client_data.php
@@ -8,6 +8,7 @@
 require_once __DIR__ . '/lib/CaseInsensitiveArray.php';
 require_once __DIR__ . '/lib/SolusVM.php';
 
+use Composer\Semver\Comparator;
 use Illuminate\Database\Capsule\Manager as Capsule;
 use SolusVM\SolusVM;
 
@@ -21,7 +22,12 @@
     exit();
 }
 
+// Adding this to workaround CORE-15619 WHMCS bug
+$whmcsVersion = $CONFIG['Version'];
 $uid = $ca->getUserID();
+if (Comparator::greaterThanOrEqualTo($whmcsVersion,'8')) {
+    $uid = Auth::client()->id;
+}
 
 $params = SolusVM::getParamsFromVserviceID( $vserverid, $uid );
 if ( ! $params ) {
diff --git a/modules/servers/solusvmpro/html5console.php b/modules/servers/solusvmpro/html5console.php
index 7c9406b..9edf69c 100644
--- a/modules/servers/solusvmpro/html5console.php
+++ b/modules/servers/solusvmpro/html5console.php
@@ -7,6 +7,7 @@
 require_once __DIR__ . '/lib/CaseInsensitiveArray.php';
 require_once __DIR__ . '/lib/SolusVM.php';
 
+use Composer\Semver\Comparator;
 use Illuminate\Database\Capsule\Manager as Capsule;
 use SolusVM\SolusVM;
 
@@ -61,7 +62,12 @@
     }
     $uid = (int)$_GET['uid'];
 } else {
+    // Adding this to workaround CORE-15619 WHMCS bug
+    $whmcsVersion = $CONFIG['Version'];
     $uid = $ca->getUserID();
+    if (Comparator::greaterThanOrEqualTo($whmcsVersion,'8')) {
+        $uid = Auth::client()->id;
+    }
 }
 
 $servid = (int)$_GET['id'];
diff --git a/modules/servers/solusvmpro/vnc.php b/modules/servers/solusvmpro/vnc.php
index 3dd242d..68f7053 100644
--- a/modules/servers/solusvmpro/vnc.php
+++ b/modules/servers/solusvmpro/vnc.php
@@ -7,6 +7,7 @@
 require_once __DIR__ . '/lib/CaseInsensitiveArray.php';
 require_once __DIR__ . '/lib/SolusVM.php';
 
+use Composer\Semver\Comparator;
 use Illuminate\Database\Capsule\Manager as Capsule;
 use SolusVM\SolusVM;
 
@@ -32,7 +33,12 @@
     }
     $uid = (int)$_GET['uid'];
 } else {
+    // Adding this to workaround CORE-15619 WHMCS bug
+    $whmcsVersion = $CONFIG['Version'];
     $uid = $ca->getUserID();
+    if (Comparator::greaterThanOrEqualTo($whmcsVersion,'8')) {
+        $uid = Auth::client()->id;
+    }
 }
 
 $servid = isset( $_GET['id'] ) ? (int) $_GET['id'] : "";