diff --git a/login_destination.module b/login_destination.module
index 2ad4262..42f1620 100644
--- a/login_destination.module
+++ b/login_destination.module
@@ -342,7 +342,12 @@ function login_destination_get_destination($trigger = '', $current = NULL) {
     ->fetchAll();
 
   if ($current == NULL) {
-    $current = $_GET['q'];
+    if (isset( $_GET['current'])) {
+      $current =  $_GET['current'];
+    }
+    else {
+      $current = $_GET['q'];
+    }
   }
 
   // examine path matches