diff --git a/module/ErsBase/src/ErsBase/Service/OrderService.php b/module/ErsBase/src/ErsBase/Service/OrderService.php
index b8c0ac57..56ea814c 100644
--- a/module/ErsBase/src/ErsBase/Service/OrderService.php
+++ b/module/ErsBase/src/ErsBase/Service/OrderService.php
@@ -149,18 +149,18 @@ public function changeCurrency($paramCurrency) {
                     $item->setPrice($price->getCharge());
                     $em->flush($item);
                 }
+                $em->flush($package);
             }
             $order->setCurrency($currency);
             if($debug) {
                 error_log('set order to currency: '.$currency);
             }
+            if($order->getPaymentType()) {
+                $order->setPaymentType(null);
+            }
+            $em->flush($order);
         }
-        if($order->getPaymentType()) {
-            $order->setPaymentType(null);
-        }
-        $em->flush($order);
         
-        error_log('currency changed!');
         return $this;
     }
     
diff --git a/module/PreReg/src/PreReg/Controller/ProductController.php b/module/PreReg/src/PreReg/Controller/ProductController.php
index 94586dd8..4a4ad8ed 100644
--- a/module/PreReg/src/PreReg/Controller/ProductController.php
+++ b/module/PreReg/src/PreReg/Controller/ProductController.php
@@ -493,8 +493,6 @@ public function editAction() {
     public function deleteAction() {
         $logger = $this->getServiceLocator()->get('Logger');
 
-        $breadcrumbService = new Service\BreadcrumbService();
-
         $breadcrumbService = new Service\BreadcrumbService();
         
         if(!$breadcrumbService->exists('product')) {
diff --git a/module/PreReg/view/pre-reg/product/add.phtml b/module/PreReg/view/pre-reg/product/add.phtml
index 50cdfde5..d1af78ec 100644
--- a/module/PreReg/view/pre-reg/product/add.phtml
+++ b/module/PreReg/view/pre-reg/product/add.phtml
@@ -57,7 +57,6 @@
                 <div class="col-md-6">
                     <?php if($product->getPriceCount() != 1): ?>
                         <p class="small text-right"><?php echo sprintf($this->translate('The prices will increase after <br /> %s'), $deadline->getDeadline()->format('d.m.Y H:i:s T')); ?></p>
-                        <p clas="text-right">
                         <p class="text-right">
                             <?php echo $this->partial('partial/currency-chooser.phtml', array('form' => $this->currencychooser())); ?>
                         </p>
diff --git a/module/PreReg/view/pre-reg/product/edit.phtml b/module/PreReg/view/pre-reg/product/edit.phtml
index 638ae801..b2e473aa 100644
--- a/module/PreReg/view/pre-reg/product/edit.phtml
+++ b/module/PreReg/view/pre-reg/product/edit.phtml
@@ -9,9 +9,8 @@
     <?php
     $form = $this->form;
     $form->prepare();
-    $form->get('submit')->setAttribute('value', 'save changes');
+    $form->get('submit')->setAttribute('value', 'save changes'); ?>
 
-    echo $this->form()->openTag($form); ?>
     <div class="row">
         <div class="col-md-5" style="text-align: center; margin: 20px 0;">
             <i class="fa fa-ticket product-icon-lg"></i>
@@ -38,17 +37,14 @@
                     <?php if($product->getPriceCount() != 1): ?>
                         <p class="small text-right"><?php echo $this->translate('The prices will increase after'); ?><br><?php echo $deadline->getDeadline()->format('d.m.Y H:i:s T'); ?></p>
                         <p class="text-right">
-                            Show prices in: 
-                            <select name="currency">
-                                <option>Euro</option>
-                                <option>Zloty</option>
-                            </select>
+                            <?php echo $this->partial('partial/currency-chooser.phtml', array('form' => $this->currencychooser())); ?>
                         </p>
                     <?php endif; ?>
                     <?php echo $this->partial('partial/product-price.phtml', array('agegroups' => $agegroups, 'deadline' => $deadline, 'product' => $product)); ?>
                 </div>
             </div>
             <div class="row">
+                <?php echo $this->form()->openTag($form); ?>
                 <div class="col-md-6 ui-tabs-panel ui-widget-content ui-corner-all">
                     <div id="person-detail">
                         <ul>
@@ -125,10 +121,10 @@
                     <?php endforeach; ?>
                     <?php endif; ?>
                 </div>
+                <?php echo $this->form()->closeTag(); ?>
             </div>
         </div>
     </div>
-    <?php echo $this->form()->closeTag(); ?>
 </div>
 <div id="addParticipant" class="modal fade" role="dialog">
     <div class="modal-dialog">