diff --git a/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/CordModelCache.java b/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/CordModelCache.java
index a098e8d..dd1e42b 100644
--- a/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/CordModelCache.java
+++ b/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/CordModelCache.java
@@ -138,10 +138,8 @@
         subscriberId = lookupSubId(ssid);
         XosManager.INSTANCE.setXosUtilsForSubscriber(subscriberId);
 
-        // if we are using the demo account, tell XOS to reset it...
-        if (ssid == DEMO_SSID) {
-            XosManager.INSTANCE.initDemoSubscriber();
-        }
+        // call the initdemo API to ensure users are populated in XOS
+        XosManager.INSTANCE.initDemoSubscriber();
 
         // NOTE: I think the following should work for non-DEMO account...
         currentBundle = new Bundle(BundleFactory.BASIC_BUNDLE);