diff --git a/source/java/org/alfresco/web/forms/xforms/XFormsBean.java b/source/java/org/alfresco/web/forms/xforms/XFormsBean.java
index 4f8318cffa..6b07141879 100644
--- a/source/java/org/alfresco/web/forms/xforms/XFormsBean.java
+++ b/source/java/org/alfresco/web/forms/xforms/XFormsBean.java
@@ -574,34 +574,34 @@ public class XFormsBean implements Serializable
                                        request.getContextPath() + "/wcservice");
                String rewrittenURI = uri;
                
-               if (uri.contains("{storeid}"))
-               {
-                  final String storeId = AVMUtil.getStoreName(cwdAvmPath);
-                  rewrittenURI         = uri.replace("{storeid}", storeId);
-               }
-               else if (uri.contains("${storeid}"))
+               if (uri.contains("${storeid}"))
                {
                   final String storeId = AVMUtil.getStoreName(cwdAvmPath);
                   rewrittenURI         = uri.replace("${storeid}", storeId);
                }
+               else if (uri.contains("{storeid}"))
+               {
+                  final String storeId = AVMUtil.getStoreName(cwdAvmPath);
+                  rewrittenURI         = uri.replace("{storeid}", storeId);
+               }
                else
                {
                   if (LOGGER.isDebugEnabled())
                      LOGGER.debug("no store id specified in webscript URI " + uri);
                }
                
-               if (uri.contains("{ticket}"))
-               {
-                  AuthenticationService authenticationService = Repository.getServiceRegistry(facesContext).getAuthenticationService();
-                  final String ticket = authenticationService.getCurrentTicket();
-                  rewrittenURI        = rewrittenURI.replace("{ticket}", ticket);
-               }
-               else if (uri.contains("${ticket}"))
+               if (uri.contains("${ticket}"))
                {
                   AuthenticationService authenticationService = Repository.getServiceRegistry(facesContext).getAuthenticationService();
                   final String ticket = authenticationService.getCurrentTicket();
                   rewrittenURI        = rewrittenURI.replace("${ticket}", ticket);
                }
+               else if (uri.contains("{ticket}"))
+               {
+                  AuthenticationService authenticationService = Repository.getServiceRegistry(facesContext).getAuthenticationService();
+                  final String ticket = authenticationService.getCurrentTicket();
+                  rewrittenURI        = rewrittenURI.replace("{ticket}", ticket);
+               }
                else
                {
                   if (LOGGER.isDebugEnabled())