diff --git a/includes/common.inc b/includes/common.inc
index 776e113b3e70937748f68aceac006ee9eab15071..e441b3f302767437856a026639f3b10fd6f43ff0 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -79,7 +79,12 @@ function drupal_goto($url) {
   ** is compiled with "--enable-trans-sid".
   */
 
-  header("Location: $url&". SID);
+  if (strstr($url, "?")) {
+    header("Location: $url&". SID);
+  }
+  else {
+    header("Location: $url?". SID);
+  }
 }
 
 function check_form($text) {