diff --git a/src/se/koc/hal/page/PCConfigureHttpPage.java b/src/se/koc/hal/page/PCConfigureHttpPage.java
index c849e52c..32c6307d 100755
--- a/src/se/koc/hal/page/PCConfigureHttpPage.java
+++ b/src/se/koc/hal/page/PCConfigureHttpPage.java
@@ -9,23 +9,29 @@ import zutil.db.DBConnection;
 import zutil.io.file.FileUtil;
 import zutil.parser.Templator;
 import zutil.ui.Configurator;
+import zutil.ui.Configurator.*;
 
-import java.lang.reflect.Array;
 import java.util.Map;
 
 public class PCConfigureHttpPage extends HalHttpPage {
-
-    private Configurator[] sensorConfigurations;
+    private class SensorDataParams{
+        public Class clazz;
+        public ConfigurationParam[] params;
+    }
+    private SensorDataParams[] sensorConfigurations;
 
 
     public PCConfigureHttpPage() {
         super("Configuration", "config");
 
-        sensorConfigurations = new Configurator[
+        sensorConfigurations = new SensorDataParams[
                 ControllerManager.getInstance().getAvailableSensors().size()];
         int i=0;
         for(Class c : ControllerManager.getInstance().getAvailableSensors()){
-            sensorConfigurations[i++] = new Configurator(c);
+            sensorConfigurations[i] = new SensorDataParams();
+            sensorConfigurations[i].clazz = c;
+            sensorConfigurations[i].params = Configurator.getConfiguration(c);
+            ++i;
         }
     }
 
diff --git a/web-resource/configure.tmpl b/web-resource/configure.tmpl
index 0af71dce..3a2c23a7 100755
--- a/web-resource/configure.tmpl
+++ b/web-resource/configure.tmpl
@@ -182,7 +182,18 @@
 
 <!------------- MODALS --------------->
 <script>
+    var sensorDataConf = {};
+
     $(function(){
+        // initialize sensor modal things
+        $("#sensor-data-conf-template div").each(function(){
+            sensorDataConf[$(this).attr("id")] = $(this).html();
+        });
+        $("#sensorModal select[name=type]").change(function(){
+            // Update dynamic inputs
+            $("#sensorModal #sensor-data-conf").html(sensorDataConf[$(this).val()]);
+        });
+        // event
         $("#sensorModal").on('show.bs.modal', function (event) {
             var button = $(event.relatedTarget);
             var modal = $(this);
@@ -191,7 +202,7 @@
                 modal.find("input[name=action]").val("modify_local_sensor");
                 modal.find("input[name=id]").val(button.data("id"));
                 modal.find("input[name=name]").val(button.data("name"));
-                modal.find("input[name=type]").val(button.data("type"));
+                modal.find("select[name=type]").val(button.data("type"));
                 modal.find("input[name=sync]").prop("checked", button.data("sync"));
                 modal.find("input[name=config]").val(button.data("config"));
             }
@@ -200,6 +211,8 @@
                 modal.find("input[name=id]").val(-1);
                 modal.find("input[name=sync]").prop("checked", "false");
             }
+            // Update dynamic inputs
+            modal.find("select[name=type]").change();
         });
 
 
@@ -253,9 +266,8 @@
                     </div>
 
                     <hr>
-                    <div class="form-group">
-                        <label class="control-label">Config:</label> <!-- Should be improved, dynamic forms? -->
-                        <input type="text" class="form-control" name="config">
+                    <div id="sensor-data-conf">
+                        <!-- Dynamic form -->
                     </div>
                 </div>
                 <div class="modal-footer">
@@ -266,6 +278,18 @@
         </div>
     </div>
 </div>
+<div id="sensor-data-conf-template" class="hidden">
+    {{#localSensorConf}}
+    <div id="{{.clazz.getName()}}">
+        {{#.params}}
+        <div class="form-group">
+            <label class="control-label">{{.getNiceName()}}:</label>
+            <input type="text" class="form-control" name="{{.getName()}}">
+        </div>
+        {{/.params}}
+    </div>
+    {{/localSensorConf}}
+</div>
 
 
 <div class="modal fade" id="userModal" tabindex="-1">