diff --git a/org.adempiere.webstore.resource/advertisements.jsp b/org.adempiere.webstore.resource/advertisements.jsp
index 43d3935477..13a42bbaf4 100644
--- a/org.adempiere.webstore.resource/advertisements.jsp
+++ b/org.adempiere.webstore.resource/advertisements.jsp
@@ -28,7 +28,7 @@
         <c:forEach items='${info.advertisements}' var='ad'> 
         <tr> 
           <td colspan="2">
-		    <a href="http://www.adempiere.com/wstore/click?<c:out value='${ad.clickTargetURL}'/>" target="_blank"> 
+		    <a href="http://www.idempiere.com/wstore/click?<c:out value='${ad.clickTargetURL}'/>" target="_blank"> 
             <img src="<c:out value='${ad.imageURL}'/>" alt="<c:out value='${ad.name}'/>" border="0" align="left"></a> 
             <img src="<c:out value='${ad.webParam2}'/>" alt="<c:out value='${ad.webParam1}'/>" border="0" align="right"> 
             &nbsp; <b><c:out value='${ad.description}'/></b>
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/LoginServlet.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/LoginServlet.java
index 7700d9d0fa..4277c9db77 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/LoginServlet.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/LoginServlet.java
@@ -190,10 +190,10 @@ public class LoginServlet extends HttpServlet
 		//	Web User
 		WebUser wu = WebUser.get(request);
 		
-		// Handover Loginprodcess to general WebLogin Handler
-		// Frst set the URL from our current situation
+		// Handover Loginprocess to general WebLogin Handler
+		// First set the URL from our current situation
 		thisLogin.setForward (url);
-		// Also handover adressConfirm
+		// Also handover addressConfirm
 		thisLogin.setAddressConfirm (addressConfirm);
 		// Since Mode Usage is not consequent we will try to figure it out.
 		if (WebUtil.getParameter(request, "Mode")==null)
@@ -210,8 +210,12 @@ public class LoginServlet extends HttpServlet
 		if (!url.startsWith("/"))
 			url = "/" + url;
 		if (log.isLoggable(Level.INFO)) log.info("doPost - Forward to " + url);
-		RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(url);
-		dispatcher.forward(request, response);
+		if (url.startsWith("/orderServlet")) {
+			response.sendRedirect(url.substring(1));
+		} else {
+			RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(url);
+			dispatcher.forward(request, response);
+		}
 	}	//	doPost
 	
 }	//	LoginServlet