diff --git a/.classpath b/.classpath
index 435bd5dd4..40c14ffe9 100644
--- a/.classpath
+++ b/.classpath
@@ -27,5 +27,8 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/Fiscal-Printer"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/Fiscal-Printer-API"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/CST-STD"/>
 	<classpathentry kind="output" path="bin/default"/>
 </classpath>
diff --git a/src/main/java/org/spin/grpc/service/WebStoreServiceImplementation.java b/src/main/java/org/spin/grpc/service/WebStoreServiceImplementation.java
index a4ea7f758..952f99fd6 100644
--- a/src/main/java/org/spin/grpc/service/WebStoreServiceImplementation.java
+++ b/src/main/java/org/spin/grpc/service/WebStoreServiceImplementation.java
@@ -772,6 +772,7 @@ private Order.Builder createOrder(CreateOrderRequest request, String transaction
 		MCPaymentMethod paymentMethod = MCPaymentMethod.getByValue(Env.getCtx(), request.getPaymentMethodCode(), transactionName);
 		salesOrder.setDocStatus(MOrder.DOCSTATUS_Drafted);
 		salesOrder.setDocAction(MOrder.ACTION_Complete);
+		salesOrder.set_ValueOfColumn("W_Store_ID", store.getW_Store_ID());
 		salesOrder.saveEx();
 		//	Add Lines
 		request.getProductsList().forEach(product -> addLinesToOrder(salesOrder, product, transactionName));
@@ -779,6 +780,9 @@ private Order.Builder createOrder(CreateOrderRequest request, String transaction
 		if(!salesOrder.processIt(MOrder.ACTION_Complete)) {
 			throw new AdempiereException("@Error@ " + salesOrder.getProcessMsg());
 		}
+		if(request.getUserId() > 0) {
+			salesOrder.setAD_User_ID(request.getUserId());
+		}
 		//	
 		salesOrder.saveEx();
 		//	Update Basket