diff --git a/Controller/GoogleAnalyticsAJAXController.php b/Controller/GoogleAnalyticsAJAXController.php
index 736852b3..e7e36c63 100644
--- a/Controller/GoogleAnalyticsAJAXController.php
+++ b/Controller/GoogleAnalyticsAJAXController.php
@@ -173,6 +173,7 @@ public function saveProfileAction(Request $request) {
          */
         public function saveConfigAction(Request $request) {
             // get params
+            $configId = $request->query->get('configId');
             $accountId = $request->query->get('accountId');
             $propertyId = $request->query->get('propertyId');
             $profileId = $request->query->get('profileId');
@@ -180,7 +181,7 @@ public function saveConfigAction(Request $request) {
 
             // edit the config
             $em = $this->getDoctrine()->getManager();
-            $config = $em->getRepository('KunstmaanDashboardBundle:AnalyticsConfig')->findFirst();
+            $config = $em->getRepository('KunstmaanDashboardBundle:AnalyticsConfig')->find($configId);
             if ($accountId && $propertyId && $profileId) {
                 $config->setAccountId($accountId);
                 $config->setPropertyId($propertyId);
@@ -192,7 +193,7 @@ public function saveConfigAction(Request $request) {
 
             // set the config name
             $configHelper = $this->container->get('kunstmaan_dashboard.helper.google.analytics.config');
-            $configHelper->init($config->getId());
+            $configHelper->init($configId);
             $profile = $configHelper->getActiveProfile();
             $config->setName($profile['profileName']);
             $config->setDisableGoals($disableGoals);
@@ -252,6 +253,7 @@ public function getConfigAction(Request $request) {
          * @Route("/segment/add/", name="kunstmaan_dashboard_ajax_segment_add")
          */
         public function addSegmentAction(Request $request) {
+            $configId = $request->query->get('configId');
             $em = $this->getDoctrine()->getManager();
 
             // create a new segment
@@ -262,8 +264,7 @@ public function addSegmentAction(Request $request) {
             $segment->setName($name);
 
             // add the segment to the config
-            $analyticsConfigRepository = $em->getRepository('KunstmaanDashboardBundle:AnalyticsConfig');
-            $config = $analyticsConfigRepository->findFirst();
+            $config = $em->getRepository('KunstmaanDashboardBundle:AnalyticsConfig')->find($configId);
             $segment->setConfig($config);
             $segments = $config->getSegments();
             $segments[] = $segment;
diff --git a/Controller/GoogleAnalyticsController.php b/Controller/GoogleAnalyticsController.php
index 7bc72d85..cad92615 100755
--- a/Controller/GoogleAnalyticsController.php
+++ b/Controller/GoogleAnalyticsController.php
@@ -143,9 +143,10 @@ public function configAction(Request $request)
         $params['accounts'] = $configHelper->getAccounts();
         $params['segments'] = $config->getSegments();
         $params['disableGoals'] = $config->getDisableGoals();
+        $params['configId'] = $config->getId();
 
         return $this->render(
-            'KunstmaanDashboardBundle:GoogleAnalytics:setup.html.twig',
+            'KunstmaanDashboardBundle:GoogleAnalytics:setupcontainer.html.twig',
             $params
         );
     }
diff --git a/Resources/public/js/setup/setup.js b/Resources/public/js/setup/setup.js
index d1ab4736..1b55e97e 100644
--- a/Resources/public/js/setup/setup.js
+++ b/Resources/public/js/setup/setup.js
@@ -3,6 +3,7 @@ $(function () {
     var accountId = $('#account_id').attr('data-id');
     var propertyId = $('#property_id').attr('data-id');
     var profileId = $('#profile_id').attr('data-id');
+    var configId = $('#config_id').attr('data-id');
 
 
     $('#submit_save').click(function() {
@@ -14,7 +15,7 @@ $(function () {
         $.ajax({
             type: 'get',
             url: url,
-            data: {'profileId' : profileId, 'propertyId' : propertyId, 'accountId' : accountId, 'disableGoals' : disableGoals},
+            data: {'profileId' : profileId, 'propertyId' : propertyId, 'accountId' : accountId, 'disableGoals' : disableGoals, 'configId' : configId},
             success: function (data) {
                 // get all new segments
                 var segments = $('#segments-new').children();
@@ -36,7 +37,7 @@ $(function () {
                         $.ajax({
                             type: 'get',
                             url: url,
-                            data: {'query' : query, 'name' : name},
+                            data: {'query' : query, 'name' : name, 'configId' : configId},
                             success: function (data) {
                                 location.reload();
                             }
diff --git a/Resources/views/GoogleAnalytics/setup.html.twig b/Resources/views/GoogleAnalytics/setup.html.twig
index 3ab673c9..40de8364 100644
--- a/Resources/views/GoogleAnalytics/setup.html.twig
+++ b/Resources/views/GoogleAnalytics/setup.html.twig
@@ -1,5 +1,3 @@
-{% extends 'KunstmaanAdminBundle:Default:layout.html.twig' %}
-
 {% block header %}{% endblock %}
 
 {% block content %}
@@ -61,6 +59,7 @@
             <p>
                 {{ 'dashboard.ga.setup.segment.info' | trans }} <a href="https://developers.google.com/analytics/devguides/reporting/core/v3/segments" target="_blank">{{ 'dashboard.ga.setup.segment.here' | trans }}</a>.
             </p>
+
             <ul>
                 {% for segment in segments %}
                     <li id="segment-list__{{ segment.id }}">
@@ -82,7 +81,11 @@
         </div>
 
         <div class="setup-group" id="control-group">
-            <a href="{{ path('kunstmaan_dashboard') }}" class="btn" type="submit">{{ 'dashboard.ga.setup.back' | trans }}</a>
+            {% if multiconfig is defined %}
+                <a href="{{ path('GaCollectionsBundle_Index', {'configId':configId}) }}" class="btn" type="submit">{{ 'dashboard.ga.setup.back' | trans }}</a>
+            {% else %}
+                <a href="{{ path('kunstmaan_dashboard') }}" class="btn" type="submit">{{ 'dashboard.ga.setup.back' | trans }}</a>
+            {% endif %}
             <button disabled id="submit_save" class="btn btn-primary" type="submit">{{ 'form.save' | trans }}</button>
         </div>
     </form>
@@ -97,6 +100,7 @@
     <input type="hidden" id="account_id" data-id="{{accountId}}" />
     <input type="hidden" id="property_id" data-id="{{propertyId}}" />
     <input type="hidden" id="profile_id" data-id="{{profileId}}" />
+    <input type="hidden" id="config_id" data-id="{{configId}}" />
 {% endblock %}
 
 {% block extrajavascript %}
diff --git a/Resources/views/GoogleAnalytics/setupcontainer.html.twig b/Resources/views/GoogleAnalytics/setupcontainer.html.twig
new file mode 100644
index 00000000..648d16b7
--- /dev/null
+++ b/Resources/views/GoogleAnalytics/setupcontainer.html.twig
@@ -0,0 +1,16 @@
+{% extends 'KunstmaanAdminBundle:Default:layout.html.twig' %}
+
+{% block content %}
+    {% include 'KunstmaanDashboardBundle:GoogleAnalytics:setup.html.twig'
+        with {
+            'accountId' : accountId,
+            'propertyId' : propertyId,
+            'properties' : properties,
+            'profileId' : profileId,
+            'profiles' : profiles,
+            'accounts' : accounts,
+            'segments' : segments,
+            'disableGoals' : disableGoals
+        }
+    %}
+{% endblock %}