diff --git a/application/controllers/ProcessController.php b/application/controllers/ProcessController.php
index bdabee5..417633f 100644
--- a/application/controllers/ProcessController.php
+++ b/application/controllers/ProcessController.php
@@ -314,7 +314,12 @@ class ProcessController extends Controller
                 $bp->countChanges()
             ))->add(Html::tag(
                 'a',
-                ['href' => Url::fromPath('businessprocess/process/config', ['config' => $bp->getName()])],
+                [
+                    'href' => Url::fromPath(
+                        'businessprocess/process/config',
+                        $this->getRequest()->getUrl()->getParams()->toArray(false)
+                    )
+                ],
                 $this->translate('Store')
             ))->add(Html::tag(
                 'a',
@@ -422,8 +427,8 @@ class ProcessController extends Controller
             ->add($this->createConfigActionBar($bp));
 
         $url = Url::fromPath(
-            'businessprocess/process/show?unlocked',
-            array('config' => $bp->getName())
+            'businessprocess/process/show',
+            $this->getRequest()->getUrl()->getParams()->toArray(false)
         );
         $this->content()->add(
             $this->loadForm('bpConfig')
diff --git a/application/forms/BpConfigForm.php b/application/forms/BpConfigForm.php
index bdeeef6..fd2caaf 100644
--- a/application/forms/BpConfigForm.php
+++ b/application/forms/BpConfigForm.php
@@ -176,7 +176,6 @@ class BpConfigForm extends BpConfigBaseForm
 
         $this->storage->storeProcess($config);
         $config->clearAppliedChanges();
-        $this->setSuccessUrl('businessprocess/process/show', array('config' => $name, 'unlocked' => '1'));
         parent::onSuccess();
     }