diff --git oauth_common.pages.inc oauth_common.pages.inc
index a9c76a7..42bd137 100644
--- oauth_common.pages.inc
+++ oauth_common.pages.inc
@@ -195,12 +195,9 @@ function oauth_common_form_authorize() {
   }
   else {
     $query = $_GET;
-    unset($query['q']); // why are there so few q's?
     drupal_goto('user/login', array(
-      'destination' => url('oauth/authorize', array(
-        'query' => $query,
-      )),
-    ));
+      'destination' => 'oauth/authorize?' . drupal_query_string_encode($query, array('q')),
+      ));
   }
 }