diff --git a/index.php b/index.php
index f83467d5fd..5d691aa8d5 100755
--- a/index.php
+++ b/index.php
@@ -34,7 +34,7 @@
      if ($phpgw_forward) {
         while (list($name,$value) = each($HTTP_GET_VARS)) {
            if (ereg("phpgw_",$name)) {
-              $extra_vars .= "&" . $name . "=$value";
+              $extra_vars .= "&" . $name . "=" . urlencode($value);
            }
         }
      }
diff --git a/login.php b/login.php
index c9b07b99c2..2fd5927fcd 100755
--- a/login.php
+++ b/login.php
@@ -111,7 +111,7 @@
        if ($phpgw_forward) {
           while (list($name,$value) = each($HTTP_GET_VARS)) {
              if (ereg("phpgw_",$name)) {
-                $extra_vars .= "&" . $name . "=$value";
+                $extra_vars .= "&" . $name . "=" . urlencode($value);
              }
           }
        }
@@ -162,7 +162,7 @@
 
   while (list($name,$value) = each($HTTP_GET_VARS)) {
      if (ereg("phpgw_",$name)) {
-        $extra_vars .= "&" . $name . "=$value";
+        $extra_vars .= "&" . $name . "=" . urlencode($value);
      }
   }
   if ($extra_vars) {