diff --git a/ajax/frontend/order/reload.php b/ajax/frontend/order/reload.php
index 0a93bac058fe8facd3ea0dfb005efc5b70eafe5e..5cf8857831e90bd812df93ae6f817e33814ddb91 100644
--- a/ajax/frontend/order/reload.php
+++ b/ajax/frontend/order/reload.php
@@ -13,12 +13,13 @@
  */
 QUI::$Ajax->registerFunction(
     'package_quiqqer_order_ajax_frontend_order_reload',
-    function ($orderId, $step, $orderHash) {
+    function ($orderId, $step, $orderHash, $basketEditable) {
         $_REQUEST['current'] = $step;
 
         $OrderProcess = new QUI\ERP\Order\OrderProcess([
-            'orderId'   => (int)$orderId,
-            'orderHash' => $orderHash
+            'orderId'        => (int)$orderId,
+            'orderHash'      => $orderHash,
+            'basketEditable' => \boolval($basketEditable)
         ]);
 
         $Order   = $OrderProcess->getOrder();
@@ -41,5 +42,5 @@ function ($orderId, $step, $orderHash) {
             'hash' => $Order->getHash()
         ];
     },
-    ['orderId', 'step', 'orderHash']
+    ['orderId', 'step', 'orderHash', 'basketEditable']
 );
diff --git a/bin/frontend/controls/OrderProcess.js b/bin/frontend/controls/OrderProcess.js
index 3948a516ba7b45c3f15e15ba1b764456803e6f4b..05ce54bdf8d2a7ab3408a4d70fcac0a86d5d2676 100644
--- a/bin/frontend/controls/OrderProcess.js
+++ b/bin/frontend/controls/OrderProcess.js
@@ -799,9 +799,10 @@ define('package/quiqqer/order/bin/frontend/controls/OrderProcess', [
 
                     Basket.refresh();
                 }, {
-                    'package': 'quiqqer/order',
-                    orderHash: self.getAttribute('orderHash'),
-                    step     : self.getCurrentStepData().step
+                    'package'     : 'quiqqer/order',
+                    orderHash     : self.getAttribute('orderHash'),
+                    step          : self.getCurrentStepData().step,
+                    basketEditable: self.getAttribute('basketEditable') ? 1 : 0
                 });
             });
         },
diff --git a/src/QUI/ERP/Order/Controls/OrderProcess/CustomerData.php b/src/QUI/ERP/Order/Controls/OrderProcess/CustomerData.php
index 9c17bff9a8bacf660cb66012c40365458ccf7b28..7622f58fa2e7724aee76f5f1cfb5084df53b970f 100644
--- a/src/QUI/ERP/Order/Controls/OrderProcess/CustomerData.php
+++ b/src/QUI/ERP/Order/Controls/OrderProcess/CustomerData.php
@@ -97,6 +97,11 @@ public function getBody()
                 return '';
             }
 
+            if (QUI\ERP\Utils\Shop::isB2CPrioritized() ||
+                QUI\ERP\Utils\Shop::isOnlyB2C()) {
+                return '';
+            }
+
             if (QUI\ERP\Utils\Shop::isB2B()) {
                 return ' selected="selected"';
             }
diff --git a/types/orderingProcess.php b/types/orderingProcess.php
index fdca2d69979bd4b171bd8fcebbf4c46c1b4bea89..cbb110f2d2f2e7b8a368e5d99e52dbb7464342ee 100644
--- a/types/orderingProcess.php
+++ b/types/orderingProcess.php
@@ -4,8 +4,9 @@
 
 try {
     $OrderProcess = new QUI\ERP\Order\OrderProcess([
-        'step'      => $Site->getAttribute('order::step'),
-        'orderHash' => $Site->getAttribute('order::hash')
+        'step'           => $Site->getAttribute('order::step'),
+        'orderHash'      => $Site->getAttribute('order::hash'),
+        'basketEditable' => false
     ]);
 
     $Engine->assign([