diff --git a/design/admin/templates/shop/orderlist.tpl b/design/admin/templates/shop/orderlist.tpl
index 62e6f0414a0..4ffb226e64e 100644
--- a/design/admin/templates/shop/orderlist.tpl
+++ b/design/admin/templates/shop/orderlist.tpl
@@ -73,7 +73,7 @@
     {if is_null($Orders.item.account_name)}
         <s><i>{'( removed )'|i18n( 'design/admin/shop/orderlist' )}</i></s>
     {else}
-        <a href={concat( '/shop/customerorderview/', $Orders.item.user_id, '/', $Orders.item.account_email )|ezurl}>{$Orders.item.account_name|wash}</a>
+        <a href={concat( '/shop/customerorderview/', $Orders.item.user_id, '?email=', $Orders.item.account_email|urlencode )|ezurl}>{$Orders.item.account_name|wash}</a>
     {/if}
     </td>
     
diff --git a/kernel/shop/customerorderview.php b/kernel/shop/customerorderview.php
index e517ffa3c8e..5335d3fc17b 100644
--- a/kernel/shop/customerorderview.php
+++ b/kernel/shop/customerorderview.php
@@ -16,6 +16,13 @@
 $tpl = eZTemplate::factory();
 
 $Email = urldecode( $Email );
+
+// workaround because it doesn't seem to be possible to get an urlencoded "+" character across $Params
+if ( $http->hasGetVariable( "email" ) )
+{
+    $Email = $http->getVariable( "email" );
+}
+
 $productList = eZOrder::productList( $CustomerID, $Email );
 $orderList = eZOrder::orderList( $CustomerID, $Email );