diff --git a/UI/WebServerResources/js/Scheduler/Calendar.service.js b/UI/WebServerResources/js/Scheduler/Calendar.service.js
index 5e4f7ac63..697993a1e 100644
--- a/UI/WebServerResources/js/Scheduler/Calendar.service.js
+++ b/UI/WebServerResources/js/Scheduler/Calendar.service.js
@@ -104,11 +104,10 @@
     this.$Preferences.ready().then(function() {
       if (Calendar.$Preferences.settings.Calendar.FoldersOrder)
         // Save list order
-        Calendar.saveFoldersOrder(_.flatMap(Calendar.$findAll(), 'id')).then(function() {
-          // Refresh list of calendars to fetch links associated to new calendar
-          Calendar.$reloadAll();
-        });
+        Calendar.saveFoldersOrder(_.flatMap(Calendar.$findAll(), 'id'));
     });
+    // Refresh list of calendars to fetch links associated to new calendar
+    Calendar.$reloadAll();
   };
 
   /**
@@ -166,7 +165,7 @@
 
         if (calendarData.isWebCalendar)
           group = _this.$webcalendars;
-        else if (calendarData.isSubscription)
+        else if (calendarData.owner != Calendar.activeUser.login)
           group = _this.$subscriptions;
         else
           group = _this.$calendars;