diff --git a/src/Traits/AuthController.php b/src/Traits/AuthController.php
index <HASH>..<HASH> 100644
--- a/src/Traits/AuthController.php
+++ b/src/Traits/AuthController.php
@@ -82,9 +82,13 @@ trait AuthController
         if ($query) {
             // remove "token" from the target's query string
             $params = Util::parseQueryString($query);
+            $params['shop'] = $params['shop'] ?? $shopDomain->toNative() ?? '';
             unset($params['token']);
 
             $cleanTarget = trim(explode('?', $target)[0].'?'.http_build_query($params), '?');
+        } else {
+            $params = ['shop' => $shopDomain->toNative() ?? ''];
+            $cleanTarget = trim(explode('?', $target)[0].'?'.http_build_query($params), '?');
         }
 
         return View::make(
Add shop to parameter if we already have it (#<I>)

* Add shop to parameter if we already have it 



This will fix Safari related issue



* fix



* Update AuthController.php