diff --git a/app/Ninja/PaymentDrivers/AuthorizeNetAIMPaymentDriver.php b/app/Ninja/PaymentDrivers/AuthorizeNetAIMPaymentDriver.php
index 9bec8c2426bb..b697af1bcc4a 100644
--- a/app/Ninja/PaymentDrivers/AuthorizeNetAIMPaymentDriver.php
+++ b/app/Ninja/PaymentDrivers/AuthorizeNetAIMPaymentDriver.php
@@ -5,4 +5,12 @@ namespace App\Ninja\PaymentDrivers;
 class AuthorizeNetAIMPaymentDriver extends BasePaymentDriver
 {
     protected $transactionReferenceParam = 'refId';
+
+    protected function paymentDetails($paymentMethod = false)
+    {
+        $data = parent::paymentDetails();
+        $data['solutionId'] = $this->accountGateway->getConfigField('testMode') ? 'AAA100303' : 'AAA172036';
+
+        return $data;
+    }
 }
diff --git a/composer.json b/composer.json
index 138517097f8d..d9a1b4575e2e 100644
--- a/composer.json
+++ b/composer.json
@@ -87,7 +87,8 @@
         "websight/l5-google-cloud-storage": "dev-master",
         "wepay/php-sdk": "^0.2",
         "wildbit/laravel-postmark-provider": "3.0",
-    	"abdala/omnipay-pagseguro": "0.2"
+        "abdala/omnipay-pagseguro": "0.2",
+        "omnipay/authorizenet": "dev-solution-id as 2.5.0"
 	},
     "require-dev": {
         "codeception/c3": "~2.0",
@@ -167,6 +168,10 @@
         {
             "type": "vcs",
             "url": "https://github.com/hillelcoren/omnipay-gocardlessv2"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/hillelcoren/omnipay-authorizenet"
         }
     ]
 }
diff --git a/composer.lock b/composer.lock
index 2292d9263f9a..6281ae77205e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "dbe166ca1d6734215357f6b951d287a0",
-    "content-hash": "c096f5f2fdd7f923b22b0425dcba56ec",
+    "hash": "17538bc11db205b06d6656224af6956a",
+    "content-hash": "eb01266703f4233d8fa703516a43bba8",
     "packages": [
         {
             "name": "abdala/omnipay-pagseguro",
@@ -5451,16 +5451,16 @@
         },
         {
             "name": "omnipay/authorizenet",
-            "version": "2.5.0",
+            "version": "dev-solution-id",
             "source": {
                 "type": "git",
-                "url": "https://github.com/thephpleague/omnipay-authorizenet.git",
-                "reference": "229bdb205384f2e3bf844cdf258927895b4858d5"
+                "url": "https://github.com/hillelcoren/omnipay-authorizenet.git",
+                "reference": "56e9f740c5f883208594861e1c3564f8ef686a95"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/omnipay-authorizenet/zipball/229bdb205384f2e3bf844cdf258927895b4858d5",
-                "reference": "229bdb205384f2e3bf844cdf258927895b4858d5",
+                "url": "https://api.github.com/repos/hillelcoren/omnipay-authorizenet/zipball/56e9f740c5f883208594861e1c3564f8ef686a95",
+                "reference": "56e9f740c5f883208594861e1c3564f8ef686a95",
                 "shasum": ""
             },
             "require": {
@@ -5480,7 +5480,6 @@
                     "Omnipay\\AuthorizeNet\\": "src/"
                 }
             },
-            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -5506,7 +5505,10 @@
                 "pay",
                 "payment"
             ],
-            "time": "2017-03-07 14:00:14"
+            "support": {
+                "source": "https://github.com/hillelcoren/omnipay-authorizenet/tree/solution-id"
+            },
+            "time": "2017-10-04 09:53:32"
         },
         {
             "name": "omnipay/bitpay",
@@ -12151,7 +12153,14 @@
             "time": "2016-11-23 20:04:58"
         }
     ],
-    "aliases": [],
+    "aliases": [
+        {
+            "alias": "2.5.0",
+            "alias_normalized": "2.5.0.0",
+            "version": "dev-solution-id",
+            "package": "omnipay/authorizenet"
+        }
+    ],
     "minimum-stability": "stable",
     "stability-flags": {
         "dwolla/omnipay-dwolla": 20,
@@ -12179,7 +12188,8 @@
         "omnipay/stripe": 20,
         "simshaun/recurr": 20,
         "webpatser/laravel-countries": 20,
-        "websight/l5-google-cloud-storage": 20
+        "websight/l5-google-cloud-storage": 20,
+        "omnipay/authorizenet": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,