diff --git a/sensorhub-android-app/src/org/sensorhub/android/MainActivity.java b/sensorhub-android-app/src/org/sensorhub/android/MainActivity.java
index f662d8d..2586375 100644
--- a/sensorhub-android-app/src/org/sensorhub/android/MainActivity.java
+++ b/sensorhub-android-app/src/org/sensorhub/android/MainActivity.java
@@ -523,13 +523,6 @@ public boolean verify(String arg0, SSLSession arg1) {
             sensorhubConfig.add(controllerConfig);
         }
 
-        if (isApiServiceEnabled) {
-            sensorhubConfig.add(conSysApiService);
-        }
-        if (isSosServiceEnabled) {
-            sensorhubConfig.add(sosConfig);
-        }
-
         // Template Driver
         enabled = prefs.getBoolean("template_enabled", false);
         if (enabled) {
@@ -542,6 +535,13 @@ public boolean verify(String arg0, SSLSession arg1) {
             sensorhubConfig.add(templateConfig);
         }
 
+
+        if (isApiServiceEnabled) {
+            sensorhubConfig.add(conSysApiService);
+        }
+        if (isSosServiceEnabled) {
+            sensorhubConfig.add(sosConfig);
+        }
     }
 
     protected void addSosTConfig(SensorConfig sensorConf, String user, String pwd)