diff --git a/APPL/API2/model_fac_session.inc b/APPL/API2/model_fac_session.inc
index 0535858b85..2e5e174d8a 100644
--- a/APPL/API2/model_fac_session.inc
+++ b/APPL/API2/model_fac_session.inc
@@ -16,17 +16,26 @@
 model_fac_session = // Internal only
 {
     "table": "fac_session",
-    "primary": "fac_session_sessionid_hash",
+    "primary": "fac_session_key",
     "records_name": "fac_sessions",
     "record_name": "fac_session",
-    "record_title": "FACILITOR session", // L("fac_session"),
-    "records_title": "FACILITOR sessions", // L("fac_session_m"),
-    autfunction: "WEB_FACTAB",
+    "record_title":  L("fac_session"),
+    "records_title": L("fac_session_m"),
+    "autfunction": "WEB_FACTAB",
 
     "fields": {
-        id: {
-            dbs: "fac_session_sessionid_hash",
-            "typ": "key" },
+        "id": {
+            "dbs": "fac_session_key",
+            "label": "Key",
+            "typ": "key",
+            "required": true,
+            "seq": "fac_s_fac_session_key"
+        },
+        "hash": {
+            "dbs": "fac_session_sessionid_hash",
+            "label": L("fac_session_sessionid_hash"),
+            "typ": "varchar"
+        },
         "user": {
             "dbs": "prs_perslid_key",
             "label": L("lcl_user"),
@@ -35,27 +44,27 @@ model_fac_session = // Internal only
         },
         "data": {
             "dbs": "fac_session_data",
-            //"label": L("fac_session_data"),
+            "label": L("fac_session_data"),
             "typ": "varchar"
         },
         "creation": {
             "dbs": "fac_session_aanmaak",
-            //"label": L("fac_session_aanmaak"),
+            "label": L("fac_session_aanmaak"),
             "typ": "datetime"
         },
         "expire": {
             "dbs": "fac_session_expire",
-            //"label": L("fac_session_expire"),
+            "label": L("fac_session_expire"),
             "typ": "datetime"
         },
         "ip": {
             "dbs": "fac_session_ip",
-            //"label": L("fac_session_ip")
+            "label": L("fac_session_ip"),
             "typ": "varchar"
         },
         "useragent": {
             "dbs": "fac_session_useragent",
-            //"label": L("fac_session_useragent")
+            "label": L("fac_session_useragent"),
             "typ": "varchar"
 
         }
diff --git a/APPL/API2/model_fac_setting.inc b/APPL/API2/model_fac_setting.inc
index 17d5cb9d9e..a81529db48 100644
--- a/APPL/API2/model_fac_setting.inc
+++ b/APPL/API2/model_fac_setting.inc
@@ -20,7 +20,7 @@ function model_fac_setting()
     this.record_name = "fac_setting";
     this.autfunction = "WEB_PROFIL"; //Om zelf al je geregistreerde gegevens te kunnen inzien
     this.record_title = L("lcl_fac_setting");
-//    this.records_title = L("lcl_fac_setting_m");
+    this.records_title = L("lcl_fac_setting_m");
 
 
     this.fields = {
@@ -34,57 +34,57 @@ function model_fac_setting()
         },
         "module": {
             "dbs": "fac_setting_module",
-//            "label": L("lcl_fac_module"),
+            "label": L("lcl_fac_module"),
             "typ": "varchar",
             "required": true
         },
         "name": {
             "dbs": "fac_setting_name",
-//            "label": L("lcl_fac_name"),
+            "label": L("lcl_fac_name"),
             "typ": "varchar",
             "required": true
         },
         "description": {
             "dbs": "fac_setting_description",
-//            "label": L("lcl_fac_descr"),
+            "label": L("lcl_fac_descr"),
             "typ": "varchar",
             "required": true
         },
         "comment": {
             "dbs": "fac_setting_comment",
-//            "label": L("lcl_fac_comment"),
+            "label": L("lcl_fac_comment"),
             "typ": "varchar"
         },
         "flags": {
             "dbs": "fac_setting_flags",
-//            "label": L("lcl_fac_flags"),
+            "label": L("lcl_fac_flags"),
             "typ": "number"
         },
         "type": {
             "dbs": "fac_setting_type",
-//            "label": L("lcl_fac_settingtype"),
+            "label": L("lcl_fac_settingtype"),
             "typ": "varchar",
             "required": true
         },
         "default": {
             "dbs": "fac_setting_default",
-//            "label": L("lcl_fac_default"),
+            "label": L("lcl_fac_default"),
             "typ": "varchar"
         },
         "overrule": {
             "dbs": "fac_setting_pvalue",
-//            "label": L("lcl_fac_overrule"),
+            "label": L("lcl_fac_overrule"),
             "typ": "varchar"
         },
         "value": {
             "dbs": "value",
             "sql": "COALESCE(fac_setting_pvalue, fac_setting_default)",
-//            "label": L("lcl_fac_value"),
+            "label": L("lcl_fac_value"),
             "typ": "varchar"
         },
         "date": {
             "dbs": "fac_setting_datum",
-//            "label": L("lcl_fac_time"),
+            "label": L("lcl_fac_time"),
             "typ": "datetime"
         },
         "changed_by": {