diff --git a/OpenFlow/src/Audit.ts b/OpenFlow/src/Audit.ts
index e9290c61..0b880524 100644
--- a/OpenFlow/src/Audit.ts
+++ b/OpenFlow/src/Audit.ts
@@ -26,6 +26,7 @@ export class Audit {
         Base.addRight(log, user._id, user.name, [Rights.read]);
         Base.addRight(log, impostor._id, impostor.name, [Rights.read]);
         log.success = true;
+        log._type = "impersonate";
         log.type = "impersonate";
         log.userid = user._id;
         log.name = user.name;
@@ -42,6 +43,7 @@ export class Audit {
         Base.addRight(log, user._id, user.name, [Rights.read]);
         Base.addRight(log, impostor._id, impostor.name, [Rights.read]);
         log.success = false;
+        log._type = "impersonate";
         log.type = "impersonate";
         log.userid = user._id;
         log.name = user.name;
diff --git a/OpenFlow/src/Config.ts b/OpenFlow/src/Config.ts
index f62c2611..67645f67 100644
--- a/OpenFlow/src/Config.ts
+++ b/OpenFlow/src/Config.ts
@@ -48,6 +48,7 @@ export class Config {
         Config.amqp_prefetch = parseInt(Config.getEnv("amqp_prefetch", "50"));
         Config.enable_entity_restriction = Config.parseBoolean(Config.getEnv("enable_entity_restriction", "false"));
         Config.enable_web_tours = Config.parseBoolean(Config.getEnv("enable_web_tours", "true"));
+        Config.enable_nodered_tours = Config.parseBoolean(Config.getEnv("enable_nodered_tours", "true"));
         Config.auto_hourly_housekeeping = Config.parseBoolean(Config.getEnv("auto_hourly_housekeeping", "false"));
         Config.housekeeping_update_usage_hourly = Config.parseBoolean(Config.getEnv("housekeeping_update_usage_hourly", "false"));
         Config.housekeeping_update_usersize_hourly = Config.parseBoolean(Config.getEnv("housekeeping_update_usersize_hourly", "true"));
@@ -127,6 +128,9 @@ export class Config {
         Config.decorate_roles_fetching_all_roles = Config.parseBoolean(Config.getEnv("decorate_roles_fetching_all_roles", "true"));
         Config.update_acl_based_on_groups = Config.parseBoolean(Config.getEnv("update_acl_based_on_groups", "false"));
         Config.multi_tenant = Config.parseBoolean(Config.getEnv("multi_tenant", "false"));
+        Config.cleanup_on_delete_customer = Config.parseBoolean(Config.getEnv("cleanup_on_delete_customer", "false"));
+        Config.cleanup_on_delete_user = Config.parseBoolean(Config.getEnv("cleanup_on_delete_user", "false"));
+
         Config.api_bypass_perm_check = Config.parseBoolean(Config.getEnv("api_bypass_perm_check", "false"));
         Config.websocket_package_size = parseInt(Config.getEnv("websocket_package_size", "4096"), 10);
         Config.websocket_max_package_count = parseInt(Config.getEnv("websocket_max_package_count", "1024"), 10);
@@ -238,6 +242,7 @@ export class Config {
     public static amqp_prefetch: number = parseInt(Config.getEnv("amqp_prefetch", "50"));
     public static enable_entity_restriction: boolean = Config.parseBoolean(Config.getEnv("enable_entity_restriction", "false"));
     public static enable_web_tours: boolean = Config.parseBoolean(Config.getEnv("enable_web_tours", "true"));
+    public static enable_nodered_tours: boolean = Config.parseBoolean(Config.getEnv("enable_nodered_tours", "true"));
     public static auto_hourly_housekeeping: boolean = Config.parseBoolean(Config.getEnv("auto_hourly_housekeeping", "true"));
     public static housekeeping_update_usage_hourly: boolean = Config.parseBoolean(Config.getEnv("housekeeping_update_usage_hourly", "false"));
     public static housekeeping_update_usersize_hourly: boolean = Config.parseBoolean(Config.getEnv("housekeeping_update_usersize_hourly", "true"));
@@ -319,6 +324,8 @@ export class Config {
     public static max_recursive_group_depth: number = parseInt(Config.getEnv("max_recursive_group_depth", "2"));
     public static update_acl_based_on_groups: boolean = Config.parseBoolean(Config.getEnv("update_acl_based_on_groups", "false"));
     public static multi_tenant: boolean = Config.parseBoolean(Config.getEnv("multi_tenant", "false"));
+    public static cleanup_on_delete_customer: boolean = Config.parseBoolean(Config.getEnv("cleanup_on_delete_customer", "false"));
+    public static cleanup_on_delete_user: boolean = Config.parseBoolean(Config.getEnv("cleanup_on_delete_user", "false"));
     public static api_bypass_perm_check: boolean = Config.parseBoolean(Config.getEnv("api_bypass_perm_check", "false"));
     public static websocket_package_size: number = parseInt(Config.getEnv("websocket_package_size", "4096"), 10);
     public static websocket_max_package_count: number = parseInt(Config.getEnv("websocket_max_package_count", "1024"), 10);
@@ -439,7 +446,7 @@ export class Config {
         // if anything throws, we retry
         return promiseRetry(async () => {
             const reader: any = await fetch({ url });
-            if (NoderedUtil.IsNullUndefinded(reader)) { throw new Error("Failed getting result"); return; }
+            if (NoderedUtil.IsNullUndefinded(reader)) { throw new Error("Failed getting result"); }
             const config: any = toPassportConfig(reader);
             // we need this, for Office 365 :-/
             if (reader.signingCerts && reader.signingCerts.length > 1) {
diff --git a/OpenFlow/src/DBHelper.ts b/OpenFlow/src/DBHelper.ts
index 6f7cdfbe..d3b7f695 100644
--- a/OpenFlow/src/DBHelper.ts
+++ b/OpenFlow/src/DBHelper.ts
@@ -134,9 +134,11 @@ export class DBHelper {
                 return Config.db.query<Provider>({ query: { _type: "provider" }, top: 10, collectionname: "config", jwt: Crypt.rootToken() }, span);;
             });
             // const result: Provider[] = [];
+            // https://www.w3schools.com/icons/fontawesome5_icons_brands.asp
             items.forEach(provider => {
                 // const item: any = { name: provider.name, id: provider.id, provider: provider.provider, logo: "fa-question-circle" };
-                provider.logo = "fa-question-circle";
+                provider.logo = "fa-microsoft";
+                if (provider.provider === "oidc") { provider.logo = "fa-openid"; }
                 if (provider.provider === "google") { provider.logo = "fa-google"; }
                 if (provider.provider === "saml") { provider.logo = "fa-windows"; }
                 //result.push(item);
@@ -454,7 +456,11 @@ export class DBHelper {
                 });
 
                 if (results.length > 0) {
-                    user.roles = results[0].roles;
+                    user.roles = [];
+                    results[0].roles.forEach(r => {
+                        const exists = user.roles.filter(x => x._id == r._id);
+                        if (exists.length == 0) user.roles.push(r);
+                    });
                     results[0].roles2.forEach(r => {
                         const exists = user.roles.filter(x => x._id == r._id);
                         if (exists.length == 0) user.roles.push(r);
@@ -511,15 +517,14 @@ export class DBHelper {
         }
         return user as any;
     }
-    public async FindRoleByName(name: string, parent: Span): Promise<Role> {
+    public async FindRoleByName(name: string, jwt: string, parent: Span): Promise<Role> {
         await this.init();
         const span: Span = Logger.otel.startSubSpan("dbhelper.FindByUsername", parent);
         try {
             let item = await this.memoryCache.wrap("rolename_" + name, async () => {
-                const items: Role[] = await Config.db.query<Role>({ query: { name: name, "_type": "role" }, top: 1, collectionname: "users", jwt: Crypt.rootToken() }, parent);
-                if (items === null || items === undefined || items.length === 0) { return null; }
+                if (jwt === null || jwt == undefined || jwt == "") { jwt = Crypt.rootToken(); }
                 Logger.instanse.debug("DBHelper", "FindRoleByName", "Add role to cache : " + name);
-                return items[0];
+                return Config.db.GetOne<Role>({ query: { name: name, "_type": "role" }, collectionname: "users", jwt }, parent)
             });
             if (NoderedUtil.IsNullUndefinded(item)) return null;
             return Role.assign(item);
@@ -537,15 +542,15 @@ export class DBHelper {
         const span: Span = Logger.otel.startSubSpan("dbhelper.EnsureRole", parent);
         try {
             Logger.instanse.verbose("DBHelper", "EnsureRole", `FindRoleByName ${name}`);
-            let role: Role = await this.FindRoleByName(name, span);
+            let role: Role = await this.FindRoleByName(name, jwt, span);
             if (role == null) {
                 Logger.instanse.verbose("DBHelper", "EnsureRole", `EnsureRole FindRoleById ${name}`);
-                role = await this.FindRoleById(name, null, span);
+                role = await this.FindRoleById(id, null, span);
             }
             if (role !== null && (role._id === id || NoderedUtil.IsNullEmpty(id))) { return role; }
             if (role !== null && !NoderedUtil.IsNullEmpty(role._id)) {
                 Logger.instanse.warn("DBHelper", "EnsureRole", `Deleting ${name} with ${role._id} not matcing expected id ${id}`);
-                await Config.db.DeleteOne(role._id, "users", jwt, span);
+                await Config.db.DeleteOne(role._id, "users", false, jwt, span);
             }
             role = new Role(); role.name = name; role._id = id;
             Logger.instanse.verbose("DBHelper", "EnsureRole", `Adding new role ${name}`);
@@ -564,7 +569,7 @@ export class DBHelper {
             Logger.otel.endSpan(span);
         }
     }
-    public async EnsureUser(jwt: string, name: string, username: string, id: string, password: string, parent: Span): Promise<User> {
+    public async EnsureUser(jwt: string, name: string, username: string, id: string, password: string, extraoptions: any, parent: Span): Promise<User> {
         const span: Span = Logger.otel.startSubSpan("dbhelper.ensureUser", parent);
         try {
             span?.addEvent("FindByUsernameOrId");
@@ -578,9 +583,11 @@ export class DBHelper {
             if (user !== null && id !== null) {
                 span?.addEvent("Deleting");
                 Logger.instanse.warn("DBHelper", "EnsureUser", `Deleting ${name} with ${user._id} not matcing expected id ${id}`);
-                await Config.db.DeleteOne(user._id, "users", jwt, span);
+                await Config.db.DeleteOne(user._id, "users", false, jwt, span);
             }
-            user = new User(); user._id = id; user.name = name; user.username = username;
+            user = new User();
+            if (!NoderedUtil.IsNullUndefinded(extraoptions)) user = Object.assign(user, extraoptions);
+            user._id = id; user.name = name; user.username = username;
             if (password !== null && password !== undefined && password !== "") {
                 span?.addEvent("SetPassword");
                 await Crypt.SetPassword(user, password, span);
@@ -607,10 +614,13 @@ export class DBHelper {
     public async EnsureNoderedRoles(user: TokenUser | User, jwt: string, force: boolean, parent: Span): Promise<void> {
         if (Config.auto_create_personal_nodered_group || force) {
             let name = user.username;
-            name = name.split("@").join("").split(".").join("");
+            // name = name.split("@").join("").split(".").join("");
+            // name = name.toLowerCase();
             name = name.toLowerCase();
+            name = name.replace(/([^a-z0-9]+){1,63}/gi, "");
+
 
-            let noderedadmins = await this.FindRoleById(name + "noderedadmins", jwt, parent);
+            let noderedadmins = await this.FindRoleByName(name + "noderedadmins", jwt, parent);
             if (noderedadmins == null) {
                 noderedadmins = await this.EnsureRole(jwt, name + "noderedadmins", null, parent);
                 Base.addRight(noderedadmins, user._id, user.username, [Rights.full_control]);
@@ -621,10 +631,12 @@ export class DBHelper {
         }
         if (Config.auto_create_personal_noderedapi_group || force) {
             let name = user.username;
-            name = name.split("@").join("").split(".").join("");
+            // name = name.split("@").join("").split(".").join("");
+            // name = name.toLowerCase();
             name = name.toLowerCase();
+            name = name.replace(/([^a-z0-9]+){1,63}/gi, "");
 
-            let noderedadmins = await this.FindRoleById(name + "nodered api users", jwt, parent);
+            let noderedadmins = await this.FindRoleByName(name + "nodered api users", jwt, parent);
             if (noderedadmins == null) {
                 noderedadmins = await this.EnsureRole(jwt, name + "nodered api users", null, parent);
                 Base.addRight(noderedadmins, user._id, user.username, [Rights.full_control]);
diff --git a/OpenFlow/src/DatabaseConnection.ts b/OpenFlow/src/DatabaseConnection.ts
index c4944631..56c0da14 100644
--- a/OpenFlow/src/DatabaseConnection.ts
+++ b/OpenFlow/src/DatabaseConnection.ts
@@ -846,7 +846,7 @@ export class DatabaseConnection extends events.EventEmitter {
             if (collectionname === "files") { collectionname = "fs.files"; }
             if (DatabaseConnection.usemetadata(collectionname)) {
                 let impersonationquery;
-                if (!NoderedUtil.IsNullEmpty(queryas)) impersonationquery = await this.getbasequeryuserid(queryas, "metadata._acl", [Rights.read], span);
+                if (!NoderedUtil.IsNullEmpty(queryas)) impersonationquery = await this.getbasequeryuserid(user, queryas, "metadata._acl", [Rights.read], span);
                 if (!NoderedUtil.IsNullEmpty(queryas) && !NoderedUtil.IsNullUndefinded(impersonationquery)) {
                     _query = { $and: [query, this.getbasequery(user, "metadata._acl", [Rights.read]), impersonationquery] };
                 } else {
@@ -855,7 +855,7 @@ export class DatabaseConnection extends events.EventEmitter {
                 projection = null;
             } else {
                 let impersonationquery: any;
-                if (!NoderedUtil.IsNullEmpty(queryas)) impersonationquery = await this.getbasequeryuserid(queryas, "_acl", [Rights.read], span)
+                if (!NoderedUtil.IsNullEmpty(queryas)) impersonationquery = await this.getbasequeryuserid(user, queryas, "_acl", [Rights.read], span)
                 if (!NoderedUtil.IsNullEmpty(queryas) && !NoderedUtil.IsNullUndefinded(impersonationquery)) {
                     _query = { $and: [query, this.getbasequery(user, "_acl", [Rights.read]), impersonationquery] };
                 } else {
@@ -1414,9 +1414,9 @@ export class DatabaseConnection extends events.EventEmitter {
 
             if (collectionname === "users" && item._type === "user") {
                 const u: TokenUser = (item as any);
-                u.validated = false;
-                u.formvalidated = false;
-                u.emailvalidated = false;
+                if (NoderedUtil.IsNullEmpty(u.validated)) u.validated = false;
+                if (NoderedUtil.IsNullEmpty(u.formvalidated)) u.formvalidated = false;
+                if (NoderedUtil.IsNullEmpty(u.emailvalidated)) u.emailvalidated = false;
                 if (NoderedUtil.IsNullEmpty(u.username)) { throw new Error("Username is mandatory"); }
                 if (NoderedUtil.IsNullEmpty(u.name)) { throw new Error("Name is mandatory"); }
                 span?.addEvent("FindByUsername");
@@ -1429,7 +1429,7 @@ export class DatabaseConnection extends events.EventEmitter {
                 if (NoderedUtil.IsNullEmpty(r.name)) { throw new Error("Name is mandatory"); }
                 span?.addEvent("FindByUsername");
                 Logger.DBHelper.clearCache("check for dublicates");
-                const exists2 = await Logger.DBHelper.FindRoleByName(r.name, span);
+                const exists2 = await Logger.DBHelper.FindRoleByName(r.name, null, span);
                 if (exists2 != null) { throw new Error("Access denied, role '" + r.name + "' already exists"); }
             }
 
@@ -1449,7 +1449,7 @@ export class DatabaseConnection extends events.EventEmitter {
             if (collectionname === "users" && item._type === "user") {
                 Base.addRight(item, item._id, item.name, [Rights.read, Rights.update, Rights.invoke]);
                 span?.addEvent("FindRoleByName users");
-                const users: Role = await Logger.DBHelper.FindRoleByName("users", span);
+                const users: Role = await Logger.DBHelper.FindRoleByName("users", null, span);
                 users.AddMember(item);
                 span?.addEvent("Save Users");
                 await Logger.DBHelper.Save(users, Crypt.rootToken(), span);
@@ -1619,9 +1619,9 @@ export class DatabaseConnection extends events.EventEmitter {
 
                 if (collectionname === "users" && item._type === "user") {
                     const u: TokenUser = (item as any);
-                    u.validated = false;
-                    u.formvalidated = false;
-                    u.emailvalidated = false;
+                    if (NoderedUtil.IsNullEmpty(u.validated)) u.validated = false;
+                    if (NoderedUtil.IsNullEmpty(u.formvalidated)) u.formvalidated = false;
+                    if (NoderedUtil.IsNullEmpty(u.emailvalidated)) u.emailvalidated = false;
                     if (NoderedUtil.IsNullEmpty(u.username)) { throw new Error("Username is mandatory"); }
                     if (NoderedUtil.IsNullEmpty(u.name)) { throw new Error("Name is mandatory"); }
                     span?.addEvent("FindByUsername");
@@ -1632,7 +1632,7 @@ export class DatabaseConnection extends events.EventEmitter {
                     const r: Role = (item as any);
                     if (NoderedUtil.IsNullEmpty(r.name)) { throw new Error("Name is mandatory"); }
                     span?.addEvent("FindByUsername");
-                    const exists2 = await Logger.DBHelper.FindRoleByName(r.name, span);
+                    const exists2 = await Logger.DBHelper.FindRoleByName(r.name, null, span);
                     if (exists2 != null) { throw new Error("Access denied, role '" + r.name + "' already exists"); }
                 }
 
@@ -1662,7 +1662,7 @@ export class DatabaseConnection extends events.EventEmitter {
                 if (collectionname === "users" && item._type === "user") {
                     Base.addRight(item, item._id, item.name, [Rights.read, Rights.update, Rights.invoke]);
                     span?.addEvent("FindRoleByName");
-                    const users: Role = await Logger.DBHelper.FindRoleByName("users", span);
+                    const users: Role = await Logger.DBHelper.FindRoleByName("users", null, span);
                     users.AddMember(item);
                     span?.addEvent("CleanACL");
                     item = await this.CleanACL(item, user, collectionname, span);
@@ -1758,8 +1758,10 @@ export class DatabaseConnection extends events.EventEmitter {
             await this.connect(span);
             const user: TokenUser = await Crypt.verityToken(q.jwt);
             if (user.dblocked && !user.HasRoleName("admins")) throw new Error("Access denied (db locked) could be due to hitting quota limit for " + user.username);
-            if (!DatabaseConnection.hasAuthorization(user, (q.item as Base), Rights.update)) {
-                throw new Error("Access denied, no authorization to UpdateOne with current ACL");
+            if (q.query === null || q.query === undefined) {
+                if (!DatabaseConnection.hasAuthorization(user, (q.item as Base), Rights.update)) {
+                    throw new Error("Access denied, no authorization to UpdateOne with current ACL");
+                }
             }
             if (q.collectionname === "files") { q.collectionname = "fs.files"; }
 
@@ -1883,9 +1885,12 @@ export class DatabaseConnection extends events.EventEmitter {
                             }
                         }
                     }
-                    if (q.item._acl === null || q.item._acl === undefined) {
+                    if (q.item._acl === null || q.item._acl === undefined || !Array.isArray(q.item._acl)) {
                         q.item._acl = original._acl;
                         q.item._version = original._version;
+                        if (!DatabaseConnection.hasAuthorization(user, (q.item as Base), Rights.update)) {
+                            throw new Error("Access denied, no authorization to UpdateOne with current ACL");
+                        }
                     }
                     q.item = this.ensureResource(q.item, q.collectionname);
                     if (user._id != WellknownIds.root && original._type != q.item._type && !await this.CheckEntityRestriction(user, q.collectionname, q.item, span)) {
@@ -1940,9 +1945,13 @@ export class DatabaseConnection extends events.EventEmitter {
                             }
                         }
                     }
-                    if ((q.item as any).metadata._acl === null || (q.item as any).metadata._acl === undefined) {
+                    if ((q.item as any).metadata._acl === null || (q.item as any).metadata._acl === undefined || !Array.isArray((q.item as any).metadata._acl)) {
                         (q.item as any).metadata._acl = (original as any).metadata._acl;
                         (q.item as any).metadata._version = (original as any).metadata._version;
+                        if (!DatabaseConnection.hasAuthorization(user, (q.item as any).metadata, Rights.update)) {
+                            throw new Error("Access denied, no authorization to UpdateOne with current ACL");
+                        }
+
                     }
                     (q.item as any).metadata = this.ensureResource((q.item as any).metadata, q.collectionname);
                     DatabaseConnection.traversejsonencode(q.item);
@@ -2557,7 +2566,7 @@ export class DatabaseConnection extends events.EventEmitter {
      * @param  {string} jwt JWT of user who is doing the delete, ensuring rights
      * @returns Promise<void>
      */
-    async DeleteOne(id: string | any, collectionname: string, jwt: string, parent: Span): Promise<void> {
+    async DeleteOne(id: string | any, collectionname: string, recursive: boolean, jwt: string, parent: Span): Promise<void> {
         if (id === null || id === undefined || id === "") { throw Error("id cannot be null"); }
         const span: Span = Logger.otel.startSubSpan("db.DeleteOne", parent);
         try {
@@ -2594,7 +2603,7 @@ export class DatabaseConnection extends events.EventEmitter {
             // Logger.otel.endTimer(ot_end, DatabaseConnection.mongodb_delete, { collection: collectionname });
             const docs = await this.db.collection(collectionname).find(_query).toArray();
             for (let i = 0; i < docs.length; i++) {
-                let doc = docs[i];
+                let doc: Customer = docs[i];
                 if (collectionname == "users" && doc._type == "user") {
                     const usagedocs = await this.db.collection("config").find({ "userid": doc._id, "_type": "resourceusage", "quantity": { "$gt": 0 } }).toArray();
                     if (usagedocs.length > 0) throw new Error("Access Denied, cannot delete user with active resourceusage");
@@ -2602,12 +2611,46 @@ export class DatabaseConnection extends events.EventEmitter {
                 if (collectionname == "users" && doc._type == "customer") {
                     const usagedocs = await this.db.collection("config").find({ "customerid": doc._id, "_type": "resourceusage", "quantity": { "$gt": 0 } }).toArray();
                     if (usagedocs.length > 0) throw new Error("Access Denied, cannot delete customer with active resourceusage");
-                    const userdocs = await this.db.collection("users").find({ "customerid": doc._id }).toArray();
-                    if (userdocs.length > 0) throw new Error("Access Denied, cannot delete customer with active user or roles");
+                    let userdocs = await this.db.collection("users").find({ "customerid": doc._id }).toArray();
+                    if (doc.userid != user._id) {
+                        if (userdocs.length > 0 && !Config.cleanup_on_delete_customer && !recursive) {
+                            let defaulttest = userdocs.filter(x => x._id != doc.users && x._id != doc.admins && x._id != doc.userid)
+                            if (defaulttest.length > 0) throw new Error("Access Denied, cannot delete customer with active user or roles");
+                        }
+                        if (Config.cleanup_on_delete_customer || recursive) {
+                            Logger.instanse.warn("DatabaseConnection", "DeleteOne", "[" + user.username + "] Cleaning up after up after company " + doc.name);
+                            // let queries = [];
+                            // for (var y = 0; y < userdocs.length; y++) {
+                            //     if (userdocs[y]._type == "user") {
+                            //         queries.push({ "_createdbyid": userdocs[y]._id });
+                            //         // queries.push({ "_modifiedbyid": userdocs[y]._id });
+                            //     }
+                            // }
+                            // let query = { "$or": queries };
+                            // if (queries.length > 0) {
+                            let collections = await DatabaseConnection.toArray(this.db.listCollections());
+                            collections = collections.filter(x => x.name.indexOf("system.") === -1 && x.type == "collection"
+                                && x.name != "fs.chunks" && x.name != "audit" && !x.name.endsWith("_hist")
+                                && x.name != "mailhist" && x.name != "dbusage" && x.name != "domains" && x.name != "config"
+                                && x.name != "oauthtokens" && x.name != "users");
+                            for (let i = 0; i < collections.length; i++) {
+                                let collection = collections[i];
+                                // var res = await this.DeleteMany(query, null, collection.name, null, jwt, span);
+                                var res = await this.DeleteMany({}, null, collection.name, doc._id, jwt, span);
+                                Logger.instanse.info("DatabaseConnection", "DeleteOne", "[" + user.username + "][" + collection.name + "] Deleted " + res + " items from " + collection.name + " cleaning up after company " + doc.name);
+                            }
+                            // }
+                        }
+                        for (let i = 0; i < userdocs.length; i++) {
+                            await this.DeleteOne(userdocs[i]._id, "users", recursive, jwt, span);
+                        }
+                    } else {
+                        if (userdocs.length > 0) throw new Error("Access Denied, cannot delete customer with active user or roles");
+                    }
                 }
-                doc._deleted = new Date(new Date().toISOString());
-                doc._deletedby = user.name;
-                doc._deletedbyid = user._id;
+                (doc as any)._deleted = new Date(new Date().toISOString());
+                (doc as any)._deletedby = user.name;
+                (doc as any)._deletedbyid = user._id;
                 const fullhist = {
                     _acl: doc._acl,
                     _type: doc._type,
@@ -2617,14 +2660,14 @@ export class DatabaseConnection extends events.EventEmitter {
                     _created: doc._modified,
                     _createdby: doc._modifiedby,
                     _createdbyid: doc._modifiedbyid,
-                    _deleted: doc._deleted,
-                    _deletedby: doc._deletedby,
-                    _deletedbyid: doc._deletedbyid,
+                    _deleted: (doc as any)._deleted,
+                    _deletedby: (doc as any)._deletedby,
+                    _deletedbyid: (doc as any)._deletedbyid,
                     name: doc.name,
                     id: doc._id,
                     item: doc,
                     _version: doc._version,
-                    reason: doc.reason
+                    reason: (doc as any).reason
                 }
                 const ot_end = Logger.otel.startTimer();
                 await this.db.collection(collectionname + '_hist').insertOne(fullhist);
@@ -2637,7 +2680,30 @@ export class DatabaseConnection extends events.EventEmitter {
                     names.push(doc.name + "noderedadmins"); names.push(doc.name + "noderedusers"); names.push(doc.name + "nodered api users")
                     const subdocs = await this.db.collection("users").find({ "name": { "$in": names }, "_type": "role" }).toArray();
                     for (var r of subdocs) {
-                        this.DeleteOne(r._id, "users", jwt, span);
+                        this.DeleteOne(r._id, "users", false, jwt, span);
+                    }
+                    if (Config.cleanup_on_delete_user || recursive) {
+                        let skip_collections = [];
+                        if (!NoderedUtil.IsNullEmpty(Config.housekeeping_skip_collections)) skip_collections = Config.housekeeping_skip_collections.split(",")
+
+                        let collections = await DatabaseConnection.toArray(this.db.listCollections());
+                        collections = collections.filter(x => x.name.indexOf("system.") === -1 && x.type == "collection"
+                            && x.name != "fs.chunks" && x.name != "audit" && !x.name.endsWith("_hist")
+                            && x.name != "mailhist" && x.name != "dbusage" && x.name != "domains" && x.name != "config"
+                            && x.name != "oauthtokens" && x.name != "users");
+                        for (let i = 0; i < collections.length; i++) {
+                            let collection = collections[i];
+                            if (skip_collections.indexOf(collection.name) > -1) {
+                                Logger.instanse.info("DatabaseConnection", "DeleteOne", "[" + user.username + "][" + collection.name + "] skipped " + collection.name + " due to housekeeping_skip_collections setting");
+                                continue;
+                            }
+                            let startTime = new Date();
+                            var res = await this.DeleteMany({ "$or": [{ "_createdbyid": doc._id }, { "_modifiedbyid": doc._id }] }, null, collection.name, doc._id, jwt, span);
+                            // @ts-ignore
+                            var timeDiff = ((new Date()) - startTime); //in ms
+                            Logger.instanse.info("DatabaseConnection", "DeleteOne", "[" + user.username + "][" + collection.name + "] Deleted " + res + " items from " + collection.name + " cleaning up after user " + doc.name + " (" + timeDiff + "ms)");
+                        }
+
                     }
                     // await this.db.collection("audit").deleteMany({ "userid": doc._id });
                     // await this.db.collection("openrpa_instances").deleteMany({ "_modifiedbyid": doc._id });
@@ -2649,7 +2715,7 @@ export class DatabaseConnection extends events.EventEmitter {
                 if (collectionname == "users" && doc._type == "customer") {
                     const subdocs = await this.db.collection("config").find({ "customerid": doc._id }).toArray();
                     for (var r of subdocs) {
-                        this.DeleteOne(r._id, "config", jwt, span);
+                        this.DeleteOne(r._id, "config", false, jwt, span);
                     }
                 }
                 if (collectionname == "users" && doc._type == "role") {
@@ -2685,20 +2751,45 @@ export class DatabaseConnection extends events.EventEmitter {
      * @param  {string} jwt JWT of user who is doing the delete, ensuring rights
      * @returns Promise<void>
      */
-    async DeleteMany(query: string | any, ids: string[], collectionname: string, jwt: string, parent: Span): Promise<number> {
+    async DeleteMany(query: string | any, ids: string[], collectionname: string, queryas: string, jwt: string, parent: Span): Promise<number> {
         if (NoderedUtil.IsNullUndefinded(ids) && NoderedUtil.IsNullUndefinded(query)) { throw Error("id cannot be null"); }
         const span: Span = Logger.otel.startSubSpan("db.DeleteMany", parent);
         try {
             await this.connect();
             const user: TokenUser = await Crypt.verityToken(jwt);
-            let _query: any = {};
-            let aclfield = "_acl";
+
+
+            let baseq: any = {};
             if (collectionname === "files") { collectionname = "fs.files"; }
             if (DatabaseConnection.usemetadata(collectionname)) {
-                aclfield = "metadata._acl"
+                let impersonationquery;
+                if (!NoderedUtil.IsNullEmpty(queryas)) impersonationquery = await this.getbasequeryuserid(user, queryas, "metadata._acl", [Rights.delete], span);
+                if (!NoderedUtil.IsNullEmpty(queryas) && !NoderedUtil.IsNullUndefinded(impersonationquery)) {
+                    baseq = impersonationquery;
+                } else {
+                    baseq = this.getbasequery(user, "metadata._acl", [Rights.delete]);
+                }
+            } else {
+                let impersonationquery: any;
+                if (!NoderedUtil.IsNullEmpty(queryas)) impersonationquery = await this.getbasequeryuserid(user, queryas, "_acl", [Rights.delete], span)
+                if (!NoderedUtil.IsNullEmpty(queryas) && !NoderedUtil.IsNullUndefinded(impersonationquery)) {
+                    baseq = impersonationquery;
+                } else {
+                    baseq = this.getbasequery(user, "_acl", [Rights.delete]);
+                }
             }
-            const baseq = this.getbasequery(user, aclfield, [Rights.delete]);
+            let _query: any = {};
             if (NoderedUtil.IsNullUndefinded(query) && !NoderedUtil.IsNullUndefinded(ids)) {
+                let objectids = [];
+                if (collectionname == "files" || collectionname == "fs.files") {
+                    for (let i = 0; i < ids.length; i++) {
+                        try {
+                            objectids.push(safeObjectID(ids[i]))
+                        } catch (error) {
+                        }
+                        if (objectids.length > 0) ids = ids.concat(objectids);
+                    }
+                }
                 _query = { $and: [{ _id: { "$in": ids } }, baseq] };
             } else if (!NoderedUtil.IsNullUndefinded(query)) {
                 if (query !== null && query !== undefined) {
@@ -2744,7 +2835,10 @@ export class DatabaseConnection extends events.EventEmitter {
                     deletecounter++;
                     const ot_end = Logger.otel.startTimer();
                     const _mongodbspan: Span = Logger.otel.startSubSpan("mongodb.deletefile", span);
-                    await this._DeleteFile(c._id);
+                    try {
+                        await this._DeleteFile(c._id);
+                    } catch (error) {
+                    }
                     Logger.otel.endSpan(_mongodbspan);
                     Logger.otel.endTimer(ot_end, DatabaseConnection.mongodb_deletemany, { collection: collectionname });
                 }
@@ -2941,7 +3035,7 @@ export class DatabaseConnection extends events.EventEmitter {
         // }
         return { $or: finalor.concat() };
     }
-    private async getbasequeryuserid(userid: string, field: string, bits: number[], parent: Span): Promise<Object> {
+    private async getbasequeryuserid(calluser: TokenUser, userid: string, field: string, bits: number[], parent: Span): Promise<Object> {
         // const user = await DBHelper.FindByUsernameOrId(null, userid, parent);
         let user: User = await this.getbyid(userid, "users", Crypt.rootToken(), true, parent);
         if (NoderedUtil.IsNullUndefinded(user)) return null;
@@ -2953,6 +3047,11 @@ export class DatabaseConnection extends events.EventEmitter {
             user = await Logger.DBHelper.DecorateWithRoles(user as any, parent);
             user.roles.push(new Rolemember(user.name + " users", (user as any).users))
             user.roles.push(new Rolemember(user.name + " admins", (user as any).admins))
+            if (user._id == calluser.customerid) user.roles.push(new Rolemember(calluser.name, calluser._id));
+
+            if (!NoderedUtil.IsNullEmpty((user as any as Customer).userid)) {
+                user.roles.push(new Rolemember((user as any as Customer).userid, (user as any as Customer).userid))
+            }
             // const jwt = Crypt.createToken(user as any, Config.shorttoken_expires_in);
             return this.getbasequery(user, field, bits);
         }
@@ -3066,7 +3165,7 @@ export class DatabaseConnection extends events.EventEmitter {
             return true;
         }
 
-        if (item._acl != null && item._acl != undefined) {
+        if (item._acl != null && item._acl != undefined && Array.isArray(item._acl)) {
             if (typeof item._acl === 'string' || item._acl instanceof String) {
                 item._acl = JSON.parse((item._acl as any));
             }
@@ -3679,15 +3778,20 @@ export class EntityRestriction extends Base {
         }
         for (let path of this.paths) {
             if (!NoderedUtil.IsNullEmpty(path)) {
+                var json = { a: object };
+                Logger.instanse.verbose("DatabaseConnection", "IsMatch", path);
+                Logger.instanse.silly("DatabaseConnection", "IsMatch", JSON.stringify(json, null, 2));
                 try {
-                    const result = JSONPath({ path, json: { a: object } });
-                    if (result && result.length > 0) return true;
+                    const result = JSONPath({ path, json });
+                    if (result && result.length > 0) {
+                        Logger.instanse.verbose("DatabaseConnection", "IsMatch", "true");
+                        return true;
+                    }
                 } catch (error) {
                 }
-            } else {
-                var b = true;
             }
         }
+        Logger.instanse.verbose("DatabaseConnection", "IsMatch", "false");
         return false;
     }
     public IsAuthorized(user: TokenUser | User): boolean {
diff --git a/OpenFlow/src/Logger.ts b/OpenFlow/src/Logger.ts
index e49fcfd5..e692ecd6 100644
--- a/OpenFlow/src/Logger.ts
+++ b/OpenFlow/src/Logger.ts
@@ -71,7 +71,10 @@ export class Logger {
                 prefix = (dts.padEnd(13, " ") + "[" + cls.padEnd(21) + "][" + func + "] ").padEnd(60, " ");
             }
         }
-        return prefix + color + message + Console.Reset;
+        if (Logger.usecolors) {
+            return prefix + color + message + Console.Reset;
+        }
+        return prefix + message;
     }
     public error(cls: string, func: string, message: string | Error | unknown) {
         if (Config.unittesting) return;
diff --git a/OpenFlow/src/LoginProvider.ts b/OpenFlow/src/LoginProvider.ts
index b5a982b6..8a39a867 100644
--- a/OpenFlow/src/LoginProvider.ts
+++ b/OpenFlow/src/LoginProvider.ts
@@ -1,7 +1,7 @@
-import * as crypto from "crypto";
 import * as url from "url";
 import * as express from "express";
 import * as path from "path";
+import * as OpenIDConnectStrategy from "passport-openidconnect";
 import * as GoogleStrategy from "passport-google-oauth20";
 import * as LocalStrategy from "passport-local";
 import * as passport from "passport";
@@ -9,11 +9,8 @@ import { Config } from "./Config";
 import { Crypt } from "./Crypt";
 import { Audit } from "./Audit";
 import * as saml from "saml20";
-const multer = require('multer');
-// const GridFsStorage = require('multer-gridfs-storage');
-import { GridFsStorage } from "multer-gridfs-storage";
-import { GridFSBucket, ObjectID, Binary } from "mongodb";
-import { Base, User, NoderedUtil, TokenUser, WellknownIds, Rights, Role, InsertOrUpdateOneMessage, FederationId } from "@openiap/openflow-api";
+import { GridFSBucket, ObjectID } from "mongodb";
+import { Base, User, NoderedUtil, TokenUser, Role, FederationId } from "@openiap/openflow-api";
 import { Span } from "@opentelemetry/api";
 import { Logger } from "./Logger";
 import { DatabaseConnection } from "./DatabaseConnection";
@@ -352,7 +349,7 @@ export class LoginProvider {
                 Logger.otel.endSpan(span);
             }
         });
-        app.get("/config", (req: any, res: any, next: any): void => {
+        app.get("/config", async (req: any, res: any, next: any): Promise<void> => {
             const span: Span = Logger.otel.startSpan("LoginProvider.config");
             try {
                 span?.setAttribute("remoteip", LoginProvider.remoteip(req));
@@ -367,6 +364,14 @@ export class LoginProvider {
                 if (NoderedUtil.IsNullEmpty(nodered_domain_schema)) {
                     nodered_domain_schema = "$nodered_id$." + Config.domain;
                 }
+                let forceddomains = [];
+                var providers = await Logger.DBHelper.GetProviders(null);
+                for (let i = 0; i < providers.length; i++) {
+                    var provider: any = providers[i];
+                    if (provider.forceddomains && Array.isArray(provider.forceddomains)) {
+                        forceddomains = forceddomains.concat(provider.forceddomains);
+                    }
+                }
                 const res2 = {
                     wshost: _url,
                     wsurl: _url,
@@ -390,10 +395,12 @@ export class LoginProvider {
                     multi_tenant: Config.multi_tenant,
                     enable_entity_restriction: Config.enable_entity_restriction,
                     enable_web_tours: Config.enable_web_tours,
+                    enable_nodered_tours: Config.enable_nodered_tours,
                     collections_with_text_index: DatabaseConnection.collections_with_text_index,
                     timeseries_collections: DatabaseConnection.timeseries_collections,
                     ping_clients_interval: Config.ping_clients_interval,
-                    validlicense: Logger.License.validlicense
+                    validlicense: Logger.License.validlicense,
+                    forceddomains: forceddomains
                 }
                 Logger.instanse.debug("LoginProvider", "/config", "Return configuration settings");
                 res.end(JSON.stringify(res2));
@@ -447,7 +454,7 @@ export class LoginProvider {
                                 Logger.instanse.debug("LoginProvider", "/GetTokenRequest", "return jwt for " + key);
                                 res.status(200).send(Object.assign(exists, { message: "ok" }));
                             } else {
-                                Logger.instanse.debug("LoginProvider", "/GetTokenRequest", "USer not validated yet, for " + key);
+                                Logger.instanse.debug("LoginProvider", "/GetTokenRequest", "User not validated yet, for key " + key + " user " + user.name + " " + user._id);
                                 res.status(200).send({ message: "ok" });
                             }
                         } catch (error) {
@@ -937,198 +944,6 @@ export class LoginProvider {
                 Logger.otel.endSpan(span);
             }
         });
-        try {
-            const storage = new GridFsStorage({
-                db: Config.db,
-                file: (req, file) => {
-                    return new Promise((resolve, reject) => {
-                        crypto.randomBytes(16, async (err, buf) => {
-                            if (err) {
-                                return reject(err);
-                            }
-                            // const filename = buf.toString('hex') + path.extname(file.originalname);
-                            const filename = file.originalname;
-                            const fileInfo = {
-                                filename: filename,
-                                metadata: new Base()
-                            };
-                            let user: TokenUser | undefined;
-                            let jwt: string;
-                            const authHeader = req.headers.authorization;
-                            if (authHeader) {
-                                user = await Crypt.verityToken(authHeader);
-                                jwt = Crypt.createToken(user, Config.downloadtoken_expires_in);
-                            }
-                            else if (req.user) {
-                                user = TokenUser.From(req.user as any);
-                                jwt = Crypt.createToken(user, Config.downloadtoken_expires_in);
-                            }
-                            const { query, headers } = req;
-                            if (user === undefined) throw new Error("Access denied, unknown user");
-
-                            fileInfo.metadata.name = filename;
-                            (fileInfo.metadata as any).filename = filename;
-                            (fileInfo.metadata as any).path = "";
-                            (fileInfo.metadata as any).uniquename = query.uniquename;
-                            (fileInfo.metadata as any).form = query.form;
-                            (fileInfo.metadata as any).project = query.project;
-                            (fileInfo.metadata as any).baseurl = query.baseUrl;
-                            fileInfo.metadata._acl = [];
-                            fileInfo.metadata._createdby = user.name;
-                            fileInfo.metadata._createdbyid = user._id;
-                            fileInfo.metadata._created = new Date(new Date().toISOString());
-                            fileInfo.metadata._modifiedby = user.name;
-                            fileInfo.metadata._modifiedbyid = user._id;
-                            fileInfo.metadata._modified = fileInfo.metadata._created;
-
-                            const keys = Object.keys(query);
-                            for (let i = 0; i < keys.length; i++) {
-                                fileInfo.metadata[keys[i]] = query[keys[i]];
-                            }
-                            Base.addRight(fileInfo.metadata, user._id, user.name, [Rights.full_control]);
-                            Base.addRight(fileInfo.metadata, WellknownIds.filestore_admins, "filestore admins", [Rights.full_control]);
-                            Base.addRight(fileInfo.metadata, WellknownIds.filestore_users, "filestore users", [Rights.read]);
-                            // Fix acl
-                            fileInfo.metadata._acl.forEach((a, index) => {
-                                if (typeof a.rights === "string") {
-                                    fileInfo.metadata._acl[index].rights = (new Binary(Buffer.from(a.rights, "base64"), 0) as any);
-                                }
-                            });
-                            resolve(fileInfo);
-                        });
-                    });
-                },
-            });
-            const upload = multer({ //multer settings for single upload
-                storage: storage,
-                limits: {
-                    fileSize: (1000000 * Config.upload_max_filesize_mb) // 25MB
-                }
-            }).any();
-            app.delete("/upload", async (req: any, res: any, next: any): Promise<void> => {
-                const span: Span = Logger.otel.startSpan("LoginProvider.upload");
-                try {
-                    span?.setAttribute("remoteip", LoginProvider.remoteip(req));
-                    let user: TokenUser = null;
-                    let jwt: string = null;
-                    const authHeader = req.headers.authorization;
-                    if (authHeader) {
-                        user = await Crypt.verityToken(authHeader);
-                        jwt = Crypt.createToken(user, Config.downloadtoken_expires_in);
-                    }
-                    else if (req.user) {
-                        user = TokenUser.From(req.user as any);
-                        jwt = Crypt.createToken(user, Config.downloadtoken_expires_in);
-                    }
-                    if (user == null) {
-                        return res.status(404).send({ message: 'Route ' + req.url + ' Not found.' });
-                    }
-                    const _query = req.query;
-                    let uniquename: string = _query.uniquename;
-                    let query: any = {};
-                    if (!NoderedUtil.IsNullEmpty(uniquename)) {
-                        if (Array.isArray(uniquename)) uniquename = uniquename.join("_");
-                        if (uniquename.indexOf('/') > -1) uniquename = uniquename.substr(0, uniquename.indexOf('/'));
-                        query = { "metadata.uniquename": uniquename };
-                    }
-
-                    const arr = await Config.db.query({ query, top: 1, orderby: { "uploadDate": -1 }, collectionname: "files", jwt }, span);
-                    if (arr.length > 0) {
-                        await Config.db.DeleteOne(arr[0]._id, "files", jwt, span);
-                    }
-                    res.send({
-                        status: "success",
-                        display_status: "Success",
-                        message: uniquename + " deleted"
-                    });
-                } catch (error) {
-                    span?.recordException(error);
-                    Logger.instanse.error("LoginProvider", "/upload", error);
-                    return res.status(500).send({ message: error.message ? error.message : error });
-                } finally {
-                    Logger.otel.endSpan(span);
-                }
-
-            });
-            app.get("/upload", async (req: any, res: any, next: any): Promise<void> => {
-                const span: Span = Logger.otel.startSpan("LoginProvider.upload");
-                try {
-                    span?.setAttribute("remoteip", LoginProvider.remoteip(req));
-                    let user: TokenUser = null;
-                    let jwt: string = null;
-                    const authHeader = req.headers.authorization;
-                    if (authHeader) {
-                        user = await Crypt.verityToken(authHeader);
-                        jwt = Crypt.createToken(user, Config.downloadtoken_expires_in);
-                    }
-                    else if (req.user) {
-                        user = TokenUser.From(req.user as any);
-                        jwt = Crypt.createToken(user, Config.downloadtoken_expires_in);
-                    }
-                    if (user == null) {
-                        return res.status(404).send({ message: 'Route ' + req.url + ' Not found.' });
-                    }
-                    const _query = req.query;
-                    let uniquename: string = _query.uniquename;
-                    let query: any = {};
-                    if (!NoderedUtil.IsNullEmpty(uniquename)) {
-                        if (Array.isArray(uniquename)) uniquename = uniquename.join("_");
-                        if (uniquename.indexOf('/') > -1) uniquename = uniquename.substr(0, uniquename.indexOf('/'));
-                        query = { "metadata.uniquename": uniquename };
-                    }
-
-                    const arr = await Config.db.query({ query, top: 1, orderby: { "uploadDate": -1 }, collectionname: "files", jwt }, span);
-
-                    const id = arr[0]._id;
-                    const rows = await Config.db.query({ query: { _id: safeObjectID(id) }, top: 1, collectionname: "files", jwt }, span);
-                    if (rows == null || rows.length != 1) { return res.status(404).send({ message: 'id ' + id + ' Not found.' }); }
-                    const file = rows[0] as any;
-
-                    const bucket = new GridFSBucket(Config.db.db);
-                    let downloadStream = bucket.openDownloadStream(safeObjectID(id));
-                    res.set('Content-Type', file.contentType);
-                    res.set('Content-Disposition', 'attachment; filename="' + file.filename + '"');
-                    res.set('Content-Length', file.length);
-                    downloadStream.on("error", function (err) {
-                        res.end();
-                    });
-                    downloadStream.pipe(res);
-                    return;
-                } catch (error) {
-                    span?.recordException(error);
-                    return res.status(500).send({ message: error.message ? error.message : error });
-                } finally {
-                    Logger.otel.endSpan(span);
-                }
-            });
-            app.post("/upload", async (req, res) => {
-                let user: TokenUser = null;
-                let jwt: string = null;
-                const authHeader = req.headers.authorization;
-                if (authHeader) {
-                    user = await Crypt.verityToken(authHeader);
-                    jwt = Crypt.createToken(user, Config.downloadtoken_expires_in);
-                }
-                else if (req.user) {
-                    user = TokenUser.From(req.user as any);
-                    jwt = Crypt.createToken(user, Config.downloadtoken_expires_in);
-                }
-                if (user == null) {
-                    return res.status(404).send({ message: 'Route ' + req.url + ' Not found.' });
-                }
-
-                upload(req, res, function (err) {
-                    if (err) {
-                        res.json({ error_code: 1, err_desc: err });
-                        return;
-                    }
-                    LoginProvider.redirect(res, req.headers.referer);
-                    // res.json({ error_code: 0, err_desc: null });
-                });
-            });
-        } catch (error) {
-            Logger.instanse.error("LoginProvider", "configure", error);
-        }
 
     }
     static async RegisterProviders(app: express.Express, baseurl: string) {
@@ -1150,6 +965,11 @@ export class LoginProvider {
                             LoginProvider._providers[provider.id] =
                                 LoginProvider.CreateGoogleStrategy(app, provider.id, provider.consumerKey, provider.consumerSecret, baseurl);
                         }
+                        if (provider.provider === "oidc") {
+                            await LoginProvider.CreateOpenIDStrategy(app, provider.saml_federation_metadata, provider.id,
+                                provider.consumerKey, provider.consumerSecret, baseurl);
+                        }
+
                     }
                     if (provider.provider === "local") { hasLocal = true; }
                 } catch (error) {
@@ -1177,6 +997,55 @@ export class LoginProvider {
             Logger.otel.endSpan(span);
         }
     }
+    // https://login.microsoftonline.com/common/v2.0/.well-known/openid-configuration
+    // https://login.microsoftonline.com/aa8306d8-5417-43cc-b8e8-7e77b918682c/v2.0/.well-known/openid-configuration
+
+    // https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-protocols-oidc
+    // common - Users with both a personal Microsoft account and a work or school account from Azure AD can sign in to the application.
+    // organizations - Only users with work or school accounts from Azure AD can sign in to the application
+    // consumers - Only users with a personal Microsoft account can sign in to the application
+    // aa8306d8-5417-43cc-b8e8-7e77b918682c - Only users from a specific Azure AD tenant
+    // 9188040d-6c67-4c5b-b112-36a304b66dad = consumers tenant
+
+    // https://login.microsoftonline.com/consumers/v2.0/.well-known/openid-configuration
+
+
+    static async CreateOpenIDStrategy(app: express.Express, discoveryurl: string, key: string, clientID: string, clientSecret: string, baseurl: string): Promise<any> {
+        Logger.instanse.debug("LoginProvider", "CreateGoogleStrategy", "Adding new google strategy " + key);
+        const response = await got.get(discoveryurl, options);
+        const document = JSON.parse(response.body);
+        var options = {
+            issuer: document.issuer,
+            authorizationURL: document.authorization_endpoint,
+            tokenURL: document.token_endpoint,
+            userInfoURL: document.userinfo_endpoint,
+            clientID: clientID,
+            clientSecret: clientSecret,
+            callbackURL: url.parse(baseurl).protocol + "//" + url.parse(baseurl).host + "/" + key + "/",
+            verify: (LoginProvider.openidverify).bind(this),
+            scope: "email profile"
+        }
+        // Microsoft Graph: openid, email, profile, and offline_access. The address and phone. OpenID Connect scopes aren't supported
+        // https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-permissions-and-consent
+        const strategy: passport.Strategy = new OpenIDConnectStrategy.Strategy(options, options.verify);
+        passport.use(key, strategy);
+        strategy.name = key;
+        app.use("/" + key,
+            express.urlencoded({ extended: false }),
+            passport.authenticate(key, { failureRedirect: "/" + key, failureFlash: true }),
+            function (req: any, res: any): void {
+                const originalUrl: any = req.cookies.originalUrl;
+                res.cookie("provider", key, { maxAge: 900000, httpOnly: true });
+                if (!NoderedUtil.IsNullEmpty(originalUrl)) {
+                    res.cookie("originalUrl", "", { expires: new Date(0) });
+                    LoginProvider.redirect(res, originalUrl);
+                } else {
+                    res.redirect("/");
+                }
+            }
+        );
+        return strategy;
+    }
     static CreateGoogleStrategy(app: express.Express, key: string, consumerKey: string, consumerSecret: string, baseurl: string): any {
         Logger.instanse.debug("LoginProvider", "CreateGoogleStrategy", "Adding new google strategy " + key);
         const options: googleauthstrategyoptions = new googleauthstrategyoptions();
@@ -1316,9 +1185,9 @@ export class LoginProvider {
                         user = new User(); user.name = username; user.username = username;
                         await Crypt.SetPassword(user, password, span);
                         const jwt: string = Crypt.rootToken();
-                        user = await Logger.DBHelper.EnsureUser(jwt, user.name, user.username, null, password, span);
+                        user = await Logger.DBHelper.EnsureUser(jwt, user.name, user.username, null, password, null, span);
 
-                        const admins: Role = await Logger.DBHelper.FindRoleByName("admins", span);
+                        const admins: Role = await Logger.DBHelper.FindRoleByName("admins", null, span);
                         admins.AddMember(user);
                         await Logger.DBHelper.Save(admins, Crypt.rootToken(), span)
                     } else {
@@ -1366,7 +1235,7 @@ export class LoginProvider {
                     if (!createUser) {
                         return done(null, false);
                     }
-                    user = await Logger.DBHelper.EnsureUser(Crypt.rootToken(), username, username, null, password, span);
+                    user = await Logger.DBHelper.EnsureUser(Crypt.rootToken(), username, username, null, password, null, span);
                 } else {
                     if (user.disabled) {
                         await Audit.LoginFailed(username, "weblogin", "local", remoteip, "browser", "unknown", span);
@@ -1393,7 +1262,25 @@ export class LoginProvider {
         passport.use("local", strategy);
         app.use("/local",
             express.urlencoded({ extended: false }),
-            function (req: any, res: any, next: any): void {
+            async (req: any, res: any, next: any) => {
+                const username = req.body?.username;
+                if (!NoderedUtil.IsNullEmpty(username) && username.indexOf("@") > -1) {
+                    const domain = username.substr(username.indexOf("@") + 1)
+
+                    var providers = await Logger.DBHelper.GetProviders(null);
+                    for (let i = 0; i < providers.length; i++) {
+                        var provider: any = providers[i];
+                        if (provider.forceddomains && Array.isArray(provider.forceddomains)) {
+                            for (let d = 0; d < provider.forceddomains.length; d++) {
+                                let forceddomain = new RegExp(provider.forceddomains[d], "i");
+                                if (forceddomain.test(domain)) {
+                                    res.redirect("/" + providers[i].id);
+                                    return next();
+                                }
+                            }
+                        }
+                    }
+                }
                 passport.authenticate("local", function (err, user, info) {
                     let originalUrl: any = req.cookies.originalUrl;
                     if (err) {
@@ -1484,9 +1371,11 @@ export class LoginProvider {
                     }
                     if (NoderedUtil.IsNullEmpty(_user.name)) { done("Cannot add new user, name is empty, please add displayname to claims", null); return; }
                     const jwt: string = Crypt.rootToken();
-                    _user.federationids = [];
-                    _user.federationids.push(new FederationId(username, issuer));
-                    _user = await Logger.DBHelper.EnsureUser(jwt, _user.name, _user.username, null, null, span);
+                    let extraoptions = {
+                        federationids: [new FederationId(username, issuer)],
+                        emailvalidated: true
+                    }
+                    _user = await Logger.DBHelper.EnsureUser(jwt, _user.name, _user.username, null, null, extraoptions, span);
                 }
             } else {
                 if (!NoderedUtil.IsNullEmpty(profile["http://schemas.xmlsoap.org/ws/2005/05/identity/claims/mobile"])) {
@@ -1509,7 +1398,7 @@ export class LoginProvider {
                     const jwt: string = Crypt.rootToken();
                     const strroles: string[] = profile["http://schemas.xmlsoap.org/claims/Group"];
                     for (let i = 0; i < strroles.length; i++) {
-                        const role: Role = await Logger.DBHelper.FindRoleByName(strroles[i], span);
+                        const role: Role = await Logger.DBHelper.FindRoleByName(strroles[i], jwt, span);
                         if (!NoderedUtil.IsNullUndefinded(role)) {
                             role.AddMember(_user);
                             await Logger.DBHelper.Save(role, jwt, span);
@@ -1539,6 +1428,72 @@ export class LoginProvider {
         }
         Logger.otel.endSpan(span);
     }
+
+    static async openidverify(issuer: string, profile: any, done: any): Promise<void> {
+        const span: Span = Logger.otel.startSpan("LoginProvider.openidverify");
+        const remoteip: string = "unknown";
+        try {
+            if (profile.id && !profile.username) profile.username = profile.id;
+            if (profile.emails) {
+                const email: any = profile.emails[0];
+                profile.username = email.value;
+            }
+            let username: string = profile.username;
+            if (NoderedUtil.IsNullEmpty(username)) username = profile.nameID;
+            if (!NoderedUtil.IsNullEmpty(username)) { username = username.toLowerCase(); }
+            Logger.instanse.debug("LoginProvider", "openidverify", profile.id);
+            let _user: User = await Logger.DBHelper.FindByUsernameOrFederationid(profile.id, issuer, span);
+            if (NoderedUtil.IsNullUndefinded(_user)) {
+                _user = await Logger.DBHelper.FindByUsernameOrFederationid(profile.username, issuer, span);
+            }
+            if (NoderedUtil.IsNullUndefinded(_user)) {
+                let createUser: boolean = Config.auto_create_users;
+                if (Config.auto_create_domains.map(x => username.endsWith(x)).length > 0) { createUser = true; }
+                if (createUser) {
+                    const jwt: string = Crypt.rootToken();
+                    _user = new User(); _user.name = profile.name;
+                    if (!NoderedUtil.IsNullEmpty(profile.displayName)) { _user.name = profile.displayName; }
+                    _user.username = username;
+                    (_user as any).mobile = profile.mobile;
+                    // if (NoderedUtil.IsNullEmpty(_user.name)) { done("Cannot add new user, name is empty.", null); return; }
+                    if (NoderedUtil.IsNullEmpty(_user.name)) _user.name = username
+                    let extraoptions = {
+                        federationids: [new FederationId(profile.id, issuer)],
+                        emailvalidated: true
+                    }
+                    // ,emailvalidated: true
+                    _user = await Logger.DBHelper.EnsureUser(jwt, _user.name, _user.username, null, null, extraoptions, span);
+                }
+            } else {
+                var exists = _user.federationids.filter(x => x.id == profile.id && x.issuer == issuer);
+                if (exists.length == 0 || _user.emailvalidated == false) {
+                    _user.federationids = _user.federationids.filter(x => x.issuer != issuer);
+                    _user.federationids.push(new FederationId(profile.id, issuer));
+                    _user.emailvalidated = true;
+                    if (_user.formvalidated) _user.validated = true;
+                    const jwt: string = Crypt.rootToken();
+                    await Logger.DBHelper.Save(_user, jwt, span);
+                    await Logger.DBHelper.DeleteKey("user" + _user._id);
+                }
+            }
+            if (NoderedUtil.IsNullUndefinded(_user)) {
+                await Audit.LoginFailed(username, "weblogin", "google", remoteip, "openidverify" as any, "unknown", span);
+                done("unknown user " + username, null); return;
+            }
+            if (_user.disabled) {
+                await Audit.LoginFailed(username, "weblogin", "google", remoteip, "openidverify" as any, "unknown", span);
+                done("Disabled user " + username, null);
+                return;
+            }
+            const tuser: TokenUser = TokenUser.From(_user);
+            await Audit.LoginSuccess(tuser, "weblogin", "google", remoteip, "openidverify" as any, "unknown", span);
+            done(null, tuser);
+        } catch (error) {
+            Logger.instanse.error("LoginProvider", "openidverify", error);
+            span?.recordException(error);
+        }
+        Logger.otel.endSpan(span);
+    }
     static async googleverify(req: any, token: string, tokenSecret: string, profile: any, done: IVerifyFunction): Promise<void> {
         const span: Span = Logger.otel.startSpan("LoginProvider.googleverify");
         try {
@@ -1567,10 +1522,11 @@ export class LoginProvider {
                     _user.username = username;
                     (_user as any).mobile = profile.mobile;
                     if (NoderedUtil.IsNullEmpty(_user.name)) { done("Cannot add new user, name is empty.", null); return; }
-                    _user.federationids = [];
-                    _user.federationids.push(new FederationId(username, issuer));
-                    _user.emailvalidated = true;
-                    _user = await Logger.DBHelper.EnsureUser(jwt, _user.name, _user.username, null, null, span);
+                    let extraoptions = {
+                        federationids: [new FederationId(username, issuer)],
+                        emailvalidated: true
+                    }
+                    _user = await Logger.DBHelper.EnsureUser(jwt, _user.name, _user.username, null, null, extraoptions, span);
                 }
             } else {
                 var exists = _user.federationids.filter(x => x.id == username && x.issuer == issuer);
@@ -1633,10 +1589,12 @@ export class LoginProvider {
             let id = NoderedUtil.GetUniqueIdentifier();
             let imgurl = Config.baseurl() + "read/" + id;
             text = text.split('\n').join('<br/>\n');
-            let html = text + `<img src="${imgurl}" border="0" width="1" height="1">`
+            let html = text + `<img src="${imgurl}" alt="isread" border="0" width="1" height="1">`
             let from = Config.smtp_from;
 
             if (Config.NODE_ENV != "production") {
+                Logger.instanse.warn("LoginProvider", "sendEmail", "Skip sending email to " + to);
+                Logger.instanse.info("LoginProvider", "sendEmail", text);
                 resolve("email not sent");
             } else {
                 transporter.sendMail({
diff --git a/OpenFlow/src/Messages/Message.ts b/OpenFlow/src/Messages/Message.ts
index 6010daa6..185c7015 100644
--- a/OpenFlow/src/Messages/Message.ts
+++ b/OpenFlow/src/Messages/Message.ts
@@ -622,16 +622,6 @@ export class Message {
                     if (!this.EnsureJWT(cli)) break;
                     await this.StripeMessage(cli);
                     break;
-                case "dumpclients":
-                    break;
-                case "dumprabbitmq":
-                    break;
-                case "getrabbitmqqueue":
-                    break;
-                case "deleterabbitmqqueue":
-                    break;
-                case "pushmetrics":
-                    break;
                 case "ensurecustomer":
                     await this.EnsureCustomer(cli, span);
                     break;
@@ -779,13 +769,13 @@ export class Message {
                 if (mq != null) {
                     if (Config.amqp_force_consumer_has_update) {
                         if (!DatabaseConnection.hasAuthorization(tuser, mq, Rights.update)) {
-                            let error = new Error("[" + tuser.name + "] Unknown queue or access denied, missing update permission on exchange object " + msg.exchangename);
+                            let error = new Error(`[${tuser.name}] Unknown queue ${msg.exchangename} or access denied, missing update permission on exchange object`);
                             Logger.instanse.error("Message", "RegisterExchange", error);
                             throw error;
                         }
                     } else if (Config.amqp_force_sender_has_invoke) {
                         if (!DatabaseConnection.hasAuthorization(tuser, mq, Rights.invoke)) {
-                            let error = new Error("[" + tuser.name + "] Unknown queue or access denied, missing invoke permission on exchange object " + msg.exchangename);
+                            let error = new Error(`[${tuser.name}] Unknown queue ${msg.exchangename} or access denied, missing invoke permission on exchange object`);
                             Logger.instanse.error("Message", "RegisterExchange", error);
                             throw error;
                         }
@@ -892,13 +882,13 @@ export class Message {
                     if (mq != null) {
                         if (Config.amqp_force_consumer_has_update) {
                             if (!DatabaseConnection.hasAuthorization(tuser, mq, Rights.update)) {
-                                let error = new Error("[" + tuser.name + "] Unknown queue or access denied, missing update permission on users object " + mq.name + " " + mq._id);
+                                let error = new Error(`[${tuser.name}] Unknown queue ${mq.name} or access denied, missing update permission on users object {mq._id}`);
                                 Logger.instanse.error("Message", "RegisterQueue", error);
                                 throw error;
                             }
                         } else if (Config.amqp_force_sender_has_invoke) {
                             if (!DatabaseConnection.hasAuthorization(tuser, mq, Rights.invoke)) {
-                                let error = new Error("[" + tuser.name + "] Unknown queue or access denied, missing invoke permission on users object " + mq.name + " " + mq._id);
+                                let error = new Error(`[${tuser.name}] Unknown queue ${mq.name} or access denied, missing invoke permission on users object {mq._id}`);
                                 Logger.instanse.error("Message", "RegisterQueue", error);
                                 throw error;
                             }
@@ -911,13 +901,13 @@ export class Message {
                     if (mq != null) {
                         if (Config.amqp_force_consumer_has_update) {
                             if (!DatabaseConnection.hasAuthorization(tuser, mq, Rights.update)) {
-                                let error = new Error("[" + tuser.name + "] Unknown queue or access denied, missing update permission on queue object " + msg.queuename);
+                                let error = new Error(`[${tuser.name}] Unknown queue ${msg.queuename} or access denied, missing update permission on queue object`);
                                 Logger.instanse.error("Message", "RegisterQueue", error);
                                 throw error;
                             }
                         } else if (Config.amqp_force_sender_has_invoke) {
                             if (!DatabaseConnection.hasAuthorization(tuser, mq, Rights.invoke)) {
-                                let error = new Error("[" + tuser.name + "] Unknown queue or access denied, missing invoke permission on queue object " + msg.queuename);
+                                let error = new Error(`[${tuser.name}] Unknown queue ${msg.queuename} or access denied, missing invoke permission on queue object`);
                                 Logger.instanse.error("Message", "RegisterQueue", error);
                                 throw error;
                             }
@@ -1011,11 +1001,13 @@ export class Message {
                     if (mq != null) {
                         if (Config.amqp_force_sender_has_invoke) {
                             if (!DatabaseConnection.hasAuthorization(tuser, mq, Rights.invoke)) {
-                                throw new Error("[" + tuser.name + "] Unknown queue or access denied, missing invoke permission on users object " + mq.name + " " + mq._id);
+                                let error = new Error(`[${tuser.name}] Unknown queue ${mq.name} or access denied, missing invoke permission on users object ${mq._id}`);
+                                throw error;
                             }
                         } else {
                             if (!DatabaseConnection.hasAuthorization(tuser, mq, Rights.read)) {
-                                throw new Error("[" + tuser.name + "] Unknown queue or access denied, missing read permission on users object " + mq.name + " " + mq._id);
+                                let error = new Error(`[${tuser.name}] Unknown queue ${mq.name} or access denied, missing read permission on users object ${mq._id}`);
+                                throw error;
                             }
                         }
                         allowed = true;
@@ -1026,11 +1018,13 @@ export class Message {
                     if (mq != null) {
                         if (Config.amqp_force_sender_has_invoke) {
                             if (!DatabaseConnection.hasAuthorization(tuser, mq, Rights.invoke)) {
-                                throw new Error("[" + tuser.name + "] Unknown queue or access denied, missing invoke permission on queue object " + msg.queuename);
+                                let error = new Error(`[${tuser.name}] Unknown queue ${msg.queuename} or access denied, missing invoke permission on queue object`);
+                                throw error;
                             }
                         } else {
                             if (!DatabaseConnection.hasAuthorization(tuser, mq, Rights.read)) {
-                                throw new Error("[" + tuser.name + "] Unknown queue or access denied, missing read permission on queue object " + msg.queuename);
+                                let error = new Error(`[${tuser.name}] Unknown queue ${msg.queuename} or access denied, missing read permission on queue object`);
+                                throw error;
                             }
 
                         }
@@ -1054,11 +1048,13 @@ export class Message {
                     if (mq != null) {
                         if (Config.amqp_force_sender_has_invoke) {
                             if (!DatabaseConnection.hasAuthorization(tuser, mq, Rights.invoke)) {
-                                throw new Error("Unknown exchange or access denied, missing invoke permission on exchange object " + tuser.name);
+                                let error = new Error(`[${tuser.name}] Unknown exchange ${msg.exchange} or access denied, missing invoke permission on exchange object`);
+                                throw error;
                             }
                         } else {
                             if (!DatabaseConnection.hasAuthorization(tuser, mq, Rights.read)) {
-                                throw new Error("Unknown exchange or access denied, missing read permission on exchange object " + tuser.name);
+                                let error = new Error(`[${tuser.name}] Unknown exchange ${msg.exchange} or access denied, missing read permission on exchange object`);
+                                throw error;
                             }
 
                         }
@@ -1567,7 +1563,7 @@ export class Message {
                 }
 
             }
-            await Config.db.DeleteOne(msg.id, msg.collectionname, msg.jwt, span);
+            await Config.db.DeleteOne(msg.id, msg.collectionname, msg.recursive, msg.jwt, span);
         } catch (error) {
             if (NoderedUtil.IsNullUndefinded(msg)) { (msg as any) = {}; }
             if (msg !== null && msg !== undefined) msg.error = error.message ? error.message : error;
@@ -1588,7 +1584,7 @@ export class Message {
         try {
             msg = DeleteManyMessage.assign(this.data);
             if (NoderedUtil.IsNullEmpty(msg.jwt)) { msg.jwt = this.jwt; }
-            msg.affectedrows = await Config.db.DeleteMany(msg.query, msg.ids, msg.collectionname, msg.jwt, span);
+            msg.affectedrows = await Config.db.DeleteMany(msg.query, msg.ids, msg.collectionname, null, msg.jwt, span);
             delete msg.ids;
         } catch (error) {
             if (NoderedUtil.IsNullUndefinded(msg)) { (msg as any) = {}; }
@@ -1682,8 +1678,8 @@ export class Message {
         this.Reply();
         const span: Span = Logger.otel.startSubSpan("message.Signin", parent);
         try {
-            const hrstart = process.hrtime()
-            let hrend = process.hrtime(hrstart)
+            // const hrstart = process.hrtime()
+            // let hrend = process.hrtime(hrstart)
             let msg: SigninMessage
             let impostor: string = "";
             const UpdateDoc: any = { "$set": {} };
@@ -1695,17 +1691,47 @@ export class Message {
                 let user: User = null;
                 if (!NoderedUtil.IsNullEmpty(msg.jwt)) {
                     type = "jwtsignin";
-                    tuser = await Crypt.verityToken(msg.jwt);
+                    try {
+                        tuser = await Crypt.verityToken(msg.jwt);
+                    } catch (error) {
+                        Logger.instanse.error("Message", "Signin", "verityToken failed for client/" + cli.id + "/" + cli.clientagent + "/" + cli.remoteip + " " + error.message ? error.message : error);
+                        throw error;
+                    }
+                    let _id = tuser._id;
                     if (tuser != null) {
                         if (NoderedUtil.IsNullEmpty(tuser._id)) {
+                            _id = tuser.username;
                             user = await Logger.DBHelper.FindByUsername(tuser.username, null, span);
                         } else {
                             user = await Logger.DBHelper.FindById(tuser._id, msg.jwt, span);
                         }
                     }
                     if (tuser == null || user == null) {
-                        throw new Error("Failed resolving token ");
+                        Logger.instanse.error("Message", "Signin", "Failed resolving token, could not find user by " + _id);
+                        // Nodered will spam this, so to not strain the system to much force an 1 second delay
+                        await new Promise(resolve => { setTimeout(resolve, 1000) });
+                        throw new Error("Failed resolving token");
+                    }
+
+                    if (cli?.clientagent == "openrpa" && user.dblocked == true) {
+                        // await Audit.LoginFailed(msg.user.username, type, "websocket", cli?.remoteip, cli?.clientagent, cli?.clientversion, span);
+                        Logger.instanse.error("Message", "Signin", user.username + " is dblocked");
+                        // Dillema ....
+                        // If we send an error or empy yser, the robot will spam new tabs 
+                        // If we just close the connection the user will not know what is wrong ...                    
+                        msg.error = "User is dblocked, please login to openflow and buy more storage and try again";
+                        msg.jwt = undefined;
+                        msg.user = undefined;
+                        // Stall a little, to avoid spam
+                        await new Promise(resolve => { setTimeout(resolve, 5000) });
+                        // 
+                        cli.Close();
+                        return;
+                        // setTimeout(() => {
+                        //     cli.Close();
+                        // }, 500);
                     }
+
                     if (tuser.impostor !== null && tuser.impostor !== undefined && tuser.impostor !== "") {
                         impostor = tuser.impostor;
                     }
@@ -1716,7 +1742,13 @@ export class Message {
                     } else { // Autocreate user .... safe ?? we use this for autocreating nodered service accounts
                         if (Config.auto_create_user_from_jwt) {
                             const jwt: string = Crypt.rootToken();
-                            user = await Logger.DBHelper.EnsureUser(jwt, tuser.name, tuser.username, null, msg.password, span);
+                            let extraoptions = {
+                                federationids: [],
+                                emailvalidated: true,
+                                formvalidated: true,
+                                validated: true
+                            }
+                            user = await Logger.DBHelper.EnsureUser(jwt, tuser.name, tuser.username, null, msg.password, extraoptions, span);
                             if (user != null) tuser = TokenUser.From(user);
                             if (user == null) {
                                 tuser = new TokenUser();
@@ -1940,10 +1972,26 @@ export class Message {
                 if (!validated) {
                     if (cli?.clientagent != "nodered" && NoderedUtil.IsNullEmpty(msg.user.impostor)) {
                         await Audit.LoginFailed(msg.user.username, type, "websocket", cli?.remoteip, cli?.clientagent, cli?.clientversion, span);
-                        Logger.instanse.error("Message", "Signin", new Error(msg.user.username + " not validated"));
+                        Logger.instanse.error("Message", "Signin", msg.user.username + " not validated");
                         msg.error = "User not validated, please login again";
                         msg.jwt = undefined;
                     }
+                } else if (cli?.clientagent == "openrpa" && msg.user.dblocked == true) {
+                    // await Audit.LoginFailed(msg.user.username, type, "websocket", cli?.remoteip, cli?.clientagent, cli?.clientversion, span);
+                    Logger.instanse.error("Message", "Signin", msg.user.username + " is dblocked");
+                    // Dillema ....
+                    // If we send an error or empy yser, the robot will spam new tabs 
+                    // If we just close the connection the user will not know what is wrong ...                    
+                    msg.error = "User is dblocked, please login to openflow and buy more storage and try again";
+                    msg.jwt = undefined;
+                    msg.user = undefined;
+                    // Stall a little, to avoid spam
+                    await new Promise(resolve => { setTimeout(resolve, 5000) });
+                    // 
+                    cli.Close();
+                    // setTimeout(() => {
+                    //     cli.Close();
+                    // }, 500);
                 }
             }
             try {
@@ -1959,7 +2007,7 @@ export class Message {
                 this.data = "";
                 await handleError(cli, error);
             }
-            hrend = process.hrtime(hrstart)
+            // hrend = process.hrtime(hrstart)
         } catch (error) {
             span?.recordException(error);
         }
@@ -1994,6 +2042,7 @@ export class Message {
         const span: Span = Logger.otel.startSubSpan("message.EnsureNoderedInstance", parent);
         let msg: EnsureNoderedInstanceMessage;
         try {
+            if (Logger.nodereddriver == null) throw new Error("No nodereddriver is loaded")
             msg = EnsureNoderedInstanceMessage.assign(this.data);
             const _tuser = await Crypt.verityToken(this.jwt);
             const instancename = await this.GetInstanceName(msg._id, _tuser._id, _tuser.username, this.jwt, span);
@@ -2018,6 +2067,7 @@ export class Message {
         const span: Span = Logger.otel.startSubSpan("message.DeleteNoderedInstance", parent);
         let msg: DeleteNoderedInstanceMessage;
         try {
+            if (Logger.nodereddriver == null) throw new Error("No nodereddriver is loaded")
             msg = DeleteNoderedInstanceMessage.assign(this.data);
             const _tuser = await Crypt.verityToken(this.jwt);
             const instancename = await this.GetInstanceName(msg._id, _tuser._id, _tuser.username, this.jwt, span);
@@ -2042,6 +2092,7 @@ export class Message {
         const span: Span = Logger.otel.startSubSpan("message.DeleteNoderedPod", parent);
         let msg: DeleteNoderedPodMessage;
         try {
+            if (Logger.nodereddriver == null) throw new Error("No nodereddriver is loaded")
             msg = DeleteNoderedPodMessage.assign(this.data);
             const _tuser = await Crypt.verityToken(this.jwt);
             const instancename = await this.GetInstanceName(msg._id, _tuser._id, _tuser.username, this.jwt, span);
@@ -2066,6 +2117,7 @@ export class Message {
         const span: Span = Logger.otel.startSubSpan("message.RestartNoderedInstance", parent);
         let msg: RestartNoderedInstanceMessage;
         try {
+            if (Logger.nodereddriver == null) throw new Error("No nodereddriver is loaded")
             msg = RestartNoderedInstanceMessage.assign(this.data);
             const _tuser = await Crypt.verityToken(this.jwt);
             const instancename = await this.GetInstanceName(msg._id, _tuser._id, _tuser.username, this.jwt, span);
@@ -2090,6 +2142,7 @@ export class Message {
         const span: Span = Logger.otel.startSubSpan("message.GetKubeNodeLabels", parent);
         let msg: GetKubeNodeLabelsMessage;
         try {
+            if (Logger.nodereddriver == null) throw new Error("No nodereddriver is loaded")
             msg = GetKubeNodeLabelsMessage.assign(this.data);
             msg.result = await Logger.nodereddriver.NodeLabels(span);
         } catch (error) {
@@ -2113,6 +2166,7 @@ export class Message {
         const span: Span = Logger.otel.startSubSpan("message.GetNoderedInstance", parent);
         let msg: GetNoderedInstanceMessage;
         try {
+            if (Logger.nodereddriver == null) throw new Error("No nodereddriver is loaded")
             msg = GetNoderedInstanceMessage.assign(this.data);
             const _tuser = await Crypt.verityToken(this.jwt);
             const instancename = await this.GetInstanceName(msg._id, _tuser._id, _tuser.username, this.jwt, span);
@@ -2137,6 +2191,7 @@ export class Message {
         const span: Span = Logger.otel.startSubSpan("message.GetNoderedInstanceLog", parent);
         let msg: GetNoderedInstanceLogMessage;
         try {
+            if (Logger.nodereddriver == null) throw new Error("No nodereddriver is loaded")
             msg = GetNoderedInstanceLogMessage.assign(this.data);
             const _tuser = await Crypt.verityToken(this.jwt);
             const instancename = await this.GetInstanceName(msg._id, _tuser._id, _tuser.username, this.jwt, span);
@@ -2240,6 +2295,9 @@ export class Message {
         metadata._modifiedby = user.name;
         metadata._modifiedbyid = user._id;
         metadata._modified = metadata._created;
+        if (NoderedUtil.IsNullEmpty((metadata as any).uniquename)) {
+            (metadata as any).uniquename = NoderedUtil.GetUniqueIdentifier() + "-" + path.basename(filename);
+        }
         if (NoderedUtil.IsNullEmpty(metadata.name)) {
             metadata.name = filename;
         }
@@ -2481,6 +2539,10 @@ export class Message {
             if (!msg.initialrun) {
                 (_data as any).form = "unknown";
             }
+            if ((_data as any).payload._parentid) {
+                (_data as any)._parentid = (_data as any).payload._parentid;
+                delete (_data as any).payload._parentid;
+            }
 
             const res2 = await Config.db.InsertOne(_data, "workflow_instances", 1, true, msg.jwt, span);
             msg.newinstanceid = res2._id;
@@ -2611,7 +2673,7 @@ export class Message {
             if (usage.quantity > 0) {
                 await Config.db._UpdateOne(null, usage, "config", 1, false, Crypt.rootToken(), span);
             } else {
-                await Config.db.DeleteOne(usage._id, "config", Crypt.rootToken(), span);
+                await Config.db.DeleteOne(usage._id, "config", false, Crypt.rootToken(), span);
             }
         } catch (error) {
             span?.recordException(error);
@@ -3396,14 +3458,14 @@ export class Message {
                             await Config.db._UpdateOne(null, usage, "config", 1, false, rootjwt, span);
                         } else {
                             // Clean up old buy attempts
-                            await Config.db.DeleteOne(usage._id, "config", rootjwt, span);
+                            await Config.db.DeleteOne(usage._id, "config", false, rootjwt, span);
                         }
                     }
                 } else {
                     msg.customer.subscriptionid = null;
                     const total_usage = await Config.db.query<ResourceUsage>({ query: { "_type": "resourceusage", "customerid": msg.customer._id, "$or": [{ "siid": { "$exists": false } }, { "siid": "" }, { "siid": null }] }, top: 1000, collectionname: "config", jwt: msg.jwt }, span);
                     for (let usage of total_usage) {
-                        await Config.db.DeleteOne(usage._id, "config", rootjwt, span);
+                        await Config.db.DeleteOne(usage._id, "config", false, rootjwt, span);
                     }
                 }
                 if (msg.customer.vatnumber) {
@@ -4328,6 +4390,7 @@ export class Message {
                         (metadata as any).wi = wi._id;
                         (metadata as any).wiq = wiq.name;
                         (metadata as any).wiqid = wiq._id;
+                        (metadata as any).uniquename = NoderedUtil.GetUniqueIdentifier() + "-" + path.basename(file.filename);
 
                         metadata._acl = wiq._acl;
                         metadata.name = path.basename(file.filename);
@@ -4515,6 +4578,7 @@ export class Message {
                             (metadata as any).wi = wi._id;
                             (metadata as any).wiq = wiq.name;
                             (metadata as any).wiqid = wiq._id;
+                            (metadata as any).uniquename = NoderedUtil.GetUniqueIdentifier() + "-" + path.basename(file.filename);
 
                             metadata._acl = wiq._acl;
                             metadata.name = path.basename(file.filename);
@@ -4651,7 +4715,7 @@ export class Message {
                     var exists = wi.files.filter(x => x.name == file.filename);
                     if (exists.length > 0) {
                         try {
-                            await Config.db.DeleteOne(exists[0]._id, "fs.files", jwt, parent);
+                            await Config.db.DeleteOne(exists[0]._id, "fs.files", false, jwt, parent);
                         } catch (error) {
                             Logger.instanse.error("Message", "UpdateWorkitem", msg.error);
                         }
@@ -4691,6 +4755,7 @@ export class Message {
                         (metadata as any).wi = wi._id;
                         (metadata as any).wiq = wiq.name;
                         (metadata as any).wiqid = wiq._id;
+                        (metadata as any).uniquename = NoderedUtil.GetUniqueIdentifier() + "-" + path.basename(file.filename);
 
                         metadata._acl = wiq._acl;
                         metadata.name = path.basename(file.filename);
@@ -4839,14 +4904,14 @@ export class Message {
 
             var files = await Config.db.query({ query: { "wi": wi._id }, collectionname: "fs.files", jwt }, parent);
             for (var i = 0; i < files.length; i++) {
-                await Config.db.DeleteOne(files[i]._id, "fs.files", jwt, parent);
+                await Config.db.DeleteOne(files[i]._id, "fs.files", false, jwt, parent);
             }
             var files = await Config.db.query({ query: { "metadata.wi": wi._id }, collectionname: "fs.files", jwt }, parent);
             for (var i = 0; i < files.length; i++) {
-                await Config.db.DeleteOne(files[i]._id, "fs.files", jwt, parent);
+                await Config.db.DeleteOne(files[i]._id, "fs.files", false, jwt, parent);
             }
 
-            await Config.db.DeleteOne(wi._id, "workitems", jwt, parent);
+            await Config.db.DeleteOne(wi._id, "workitems", false, jwt, parent);
         } catch (error) {
             await handleError(null, error);
             if (NoderedUtil.IsNullUndefinded(msg)) { (msg as any) = {}; }
@@ -5004,7 +5069,7 @@ export class Message {
             msg.result = await Config.db._UpdateOne(null, wiq as any, "mq", 1, true, jwt, parent);
 
             if (msg.purge) {
-                await Config.db.DeleteMany({ "_type": "workitem", "wiqid": wiq._id }, null, "workitems", jwt, parent);
+                await Config.db.DeleteMany({ "_type": "workitem", "wiqid": wiq._id }, null, "workitems", null, jwt, parent);
                 var items = await Config.db.query<WorkitemQueue>({ query: { "_type": "workitem", "wiqid": wiq._id }, collectionname: "workitems", top: 1, jwt }, parent);
                 if (items.length > 0) {
                 }
@@ -5012,7 +5077,7 @@ export class Message {
                 if (items.length > 0) {
                     throw new Error("Failed purging workitemqueue " + wiq.name);
                 }
-                await Config.db.DeleteMany({ "metadata.wiqid": wiq._id }, null, "fs.files", jwt, parent);
+                await Config.db.DeleteMany({ "metadata.wiqid": wiq._id }, null, "fs.files", null, jwt, parent);
             }
         } catch (error) {
             await handleError(null, error);
@@ -5051,7 +5116,7 @@ export class Message {
             user = User.assign(Crypt.verityToken(this.jwt));
 
             if (msg.purge) {
-                await Config.db.DeleteMany({ "_type": "workitem", "wiqid": wiq._id }, null, "workitems", jwt, parent);
+                await Config.db.DeleteMany({ "_type": "workitem", "wiqid": wiq._id }, null, "workitems", null, jwt, parent);
                 var items = await Config.db.query<WorkitemQueue>({ query: { "_type": "workitem", "wiqid": wiq._id }, collectionname: "workitems", top: 1, jwt }, parent);
                 if (items.length > 0) {
                     items = await Config.db.query<WorkitemQueue>({ query: { "_type": "workitem", "wiqid": wiq._id }, collectionname: "workitems", top: 1, jwt }, parent);
@@ -5059,7 +5124,7 @@ export class Message {
                 if (items.length > 0) {
                     throw new Error("Failed purging workitemqueue " + wiq.name);
                 }
-                await Config.db.DeleteMany({ "metadata.wiqid": wiq._id }, null, "fs.files", jwt, parent);
+                await Config.db.DeleteMany({ "metadata.wiqid": wiq._id }, null, "fs.files", null, jwt, parent);
             } else {
                 var items = await Config.db.query<WorkitemQueue>({ query: { "_type": "workitem", "wiqid": wiq._id }, collectionname: "workitems", top: 1, jwt }, parent);
                 if (items.length > 0) {
@@ -5067,9 +5132,9 @@ export class Message {
                 }
             }
 
-            await Config.db.DeleteOne(wiq._id, "mq", jwt, parent);
+            await Config.db.DeleteOne(wiq._id, "mq", false, jwt, parent);
             if (wiq.usersrole) {
-                await Config.db.DeleteOne(wiq.usersrole, "users", jwt, parent);
+                await Config.db.DeleteOne(wiq.usersrole, "users", false, jwt, parent);
             }
         } catch (error) {
             await handleError(null, error);
diff --git a/OpenFlow/src/OAuthProvider.ts b/OpenFlow/src/OAuthProvider.ts
index 0431f2b8..84e6e7bf 100644
--- a/OpenFlow/src/OAuthProvider.ts
+++ b/OpenFlow/src/OAuthProvider.ts
@@ -7,6 +7,7 @@ import { Provider, KoaContextWithOIDC } from "oidc-provider";
 import { MongoAdapter } from "./MongoAdapter";
 import { Span } from "@opentelemetry/api";
 import { Logger } from "./Logger";
+import { Audit } from "./Audit";
 
 // const Request = OAuthServer.Request;
 // const Response = OAuthServer.Response;
@@ -271,7 +272,21 @@ export class OAuthProvider {
 
                     if (req.user) {
                         const client = await this.instance.clients.filter(x => x.clientId == params.client_id)[0];
-                        const tuser: TokenUser = TokenUser.From(req.user as any);
+                        let _user: User = req.user as any;
+                        let tuser: TokenUser = TokenUser.From(_user);
+
+                        if (!NoderedUtil.IsNullEmpty(_user.impersonating)) {
+                            const tempjwt = Crypt.createToken(tuser, Config.shorttoken_expires_in);
+                            const items = await Config.db.query({ query: { _id: _user.impersonating }, top: 1, collectionname: "users", jwt: tempjwt }, span);
+                            if (items.length == 1) {
+                                const tuserimpostor = tuser;
+                                _user = User.assign(items[0] as User);
+                                tuser = TokenUser.From(_user);
+                                Logger.instanse.info("Message", "Signin", tuser.username + " successfully impersonated");
+                                await Audit.ImpersonateSuccess(tuser, tuserimpostor, "browser", Config.version, span);
+                            }
+                        }
+
                         Account.AddAccount(tuser, client);
                         await this.instance.oidc.interactionFinished(req, res,
 
@@ -330,6 +345,7 @@ export class OAuthProvider {
             try {
                 OAuthProvider.instance = instance;
                 instance.app = app;
+                // @ts-ignore
                 this.LoadClients();
             } catch (error) {
                 Logger.instanse.error("OAuthProvider", "configure", error);
@@ -418,7 +434,7 @@ export class Account {
         return token.item;
     }
     static async RemoveTokenRequest(code: string, parent: Span) {
-        let tokens = await Config.db.DeleteMany({ _type: "tokenrequest", "code": code }, null, "oauthtokens", Crypt.rootToken(), parent);
+        let tokens = await Config.db.DeleteMany({ _type: "tokenrequest", "code": code }, null, "oauthtokens", null, Crypt.rootToken(), parent);
         return tokens[0];
     }
 }
diff --git a/OpenFlow/src/WebServer.ts b/OpenFlow/src/WebServer.ts
index bb572f2a..600299ff 100644
--- a/OpenFlow/src/WebServer.ts
+++ b/OpenFlow/src/WebServer.ts
@@ -90,12 +90,6 @@ export class WebServer {
 
             // Add headers
             this.app.use(function (req, res, next) {
-
-                // Grafana hack
-                if (req.originalUrl == "/oidc/me" && req.method == "OPTIONS") {
-                    return res.send("ok");
-                }
-                if (req.originalUrl.indexOf('/oidc') > -1) return next();
                 Logger.instanse.verbose('WebServer', 'setCORSHeaders', "add for " + req.originalUrl);
                 // const origin: string = (req.headers.origin as any);
                 // if (NoderedUtil.IsNullEmpty(origin)) {
@@ -121,11 +115,36 @@ export class WebServer {
                 res.header('Expires', '-1');
                 res.header('Pragma', 'no-cache');
 
+                if (req.originalUrl == "/me") {
+                    res.redirect('/oidc/me')
+                    return next();
+                }
+
+                // Grafana hack
+                if (req.originalUrl == "/oidc/me" && req.method == "OPTIONS") {
+                    return res.send("ok");
+                }
+                if (req.originalUrl.indexOf('/oidc') > -1) return next();
+
+
                 // Pass to next layer of middleware
                 next();
             });
             span?.addEvent("Configure LoginProvider");
             await LoginProvider.configure(this.app, baseurl);
+            try {
+                span?.addEvent("Configure FormioEP");
+
+                let FormioEPProxy: any = null;
+                try {
+                    FormioEPProxy = require("./ee/FormioEP");
+                } catch (error) {
+                }
+                if (!NoderedUtil.IsNullUndefinded(FormioEPProxy)) {
+                    await FormioEPProxy.FormioEP.configure(this.app, baseurl);
+                }
+            } catch (error) {
+            }
             span?.addEvent("Configure SamlProvider");
             await SamlProvider.configure(this.app, baseurl);
             WebServer.server = null;
diff --git a/OpenFlow/src/dockerdriver.ts b/OpenFlow/src/dockerdriver.ts
index 49da6f6a..c7049a20 100644
--- a/OpenFlow/src/dockerdriver.ts
+++ b/OpenFlow/src/dockerdriver.ts
@@ -162,7 +162,7 @@ export class dockerdriver implements i_nodered_driver {
                 "NO_PROXY=" + Config.NO_PROXY,
                 "prometheus_expose_metric=" + "false",
                 "enable_analytics=" + Config.enable_analytics.toString(),
-                "tours=" + Config.enable_web_tours.toString(),
+                "tours=" + Config.enable_nodered_tours.toString(),
                 "otel_trace_url=" + Config.otel_trace_url,
                 "otel_metric_url=" + Config.otel_metric_url,
                 "otel_trace_interval=" + Config.otel_trace_interval.toString(),
diff --git a/OpenFlow/src/index.ts b/OpenFlow/src/index.ts
index 08f6a787..06cc3b20 100644
--- a/OpenFlow/src/index.ts
+++ b/OpenFlow/src/index.ts
@@ -73,7 +73,7 @@ async function initDatabase(parent: Span): Promise<boolean> {
         const jwt: string = Crypt.rootToken();
         const admins: Role = await Logger.DBHelper.EnsureRole(jwt, "admins", WellknownIds.admins, span);
         const users: Role = await Logger.DBHelper.EnsureRole(jwt, "users", WellknownIds.users, span);
-        const root: User = await Logger.DBHelper.EnsureUser(jwt, "root", "root", WellknownIds.root, null, span);
+        const root: User = await Logger.DBHelper.EnsureUser(jwt, "root", "root", WellknownIds.root, null, null, span);
 
         Base.addRight(root, WellknownIds.admins, "admins", [Rights.full_control]);
         Base.removeRight(root, WellknownIds.admins, [Rights.delete]);
diff --git a/OpenFlow/src/public/CommonControllers.ts b/OpenFlow/src/public/CommonControllers.ts
index 5fc6a166..94a5609b 100644
--- a/OpenFlow/src/public/CommonControllers.ts
+++ b/OpenFlow/src/public/CommonControllers.ts
@@ -107,7 +107,7 @@ export class formatBytes implements ng.IDirective {
     constructor(public $location: ng.ILocationService, public $timeout: ng.ITimeoutService) {
 
     }
-    formatBytes(bytes, decimals = 2) {
+    formatBytes(bytes, decimals = 1) {
         if (bytes === 0) return '0 Bytes';
 
         const k = 1024;
@@ -533,6 +533,8 @@ export class entitiesCtrl<T> {
     public errormessage: string = "";
     public skipcustomerfilter: boolean = false;
     public page: number = 0;
+    public _onKeyDown: any;
+    public _onKeyUp: any;
 
     public static $inject = [
         "$rootScope",
@@ -554,6 +556,15 @@ export class entitiesCtrl<T> {
         public api: api,
         public userdata: userdata
     ) {
+        this._onKeyDown = this.onKeyDown.bind(this);
+        this._onKeyUp = this.onKeyUp.bind(this);
+        document.addEventListener('keydown', this._onKeyDown);
+        document.addEventListener('keyup', this._onKeyUp);
+        $scope.$on('$destroy', () => {
+            console.log('ondestroy');
+            document.removeEventListener('keydown', this._onKeyDown);
+            document.removeEventListener('keyup', this._onKeyUp);
+        })
         if (this.userdata.data != null && this.userdata.data) {
             if (this.userdata.data.basequery != null) {
                 this.basequery = this.userdata.data.basequery;
@@ -575,6 +586,34 @@ export class entitiesCtrl<T> {
         });
 
     }
+    public controldown: boolean = false;
+    public shiftdown: boolean = false;
+    public onKeyDown(e) {
+        // console.log(`${e.code}`, e);
+        if ((e.code == 'ControlLeft' || e.code == 'ControlRight') && !this.controldown) {
+            this.controldown = true;
+            if (!this.$scope.$$phase) { this.$scope.$apply(); }
+            // console.debug("Control down");
+        }
+        if ((e.code == 'ShiftLeft' || e.code == 'ShiftRight') && !this.shiftdown) {
+            this.shiftdown = true;
+            if (!this.$scope.$$phase) { this.$scope.$apply(); }
+            // console.debug("Shift down");
+        }
+    }
+    public onKeyUp(e) {
+        // console.log(`${e.code}`, e);
+        if ((e.code == 'ControlLeft' || e.code == 'ControlRight') && this.controldown) {
+            this.controldown = false;
+            if (!this.$scope.$$phase) { this.$scope.$apply(); }
+            // console.debug("Control up");
+        }
+        if ((e.code == 'ShiftLeft' || e.code == 'ShiftRight') && this.shiftdown) {
+            this.shiftdown = false;
+            if (!this.$scope.$$phase) { this.$scope.$apply(); }
+            // console.debug("Shift up");
+        }
+    }
     public static parseJson(txt, reviver, context) {
         context = context || 20
         try {
@@ -620,14 +659,18 @@ export class entitiesCtrl<T> {
             let query: object = Object.assign({}, this.basequery);
             let exactquery: object = null;
             let basequeryas = this.basequeryas;
-            if (this.collection == "users" && (this.basequery._type == "user" || this.basequery._type == "role") && !this.skipcustomerfilter && this.WebSocketClientService.multi_tenant) {
-                // if (!NoderedUtil.IsNullUndefinded(this.WebSocketClientService.customer) && !this.skipcustomerfilter) {
-                //     basequeryas = this.WebSocketClientService.customer._id;
-                // }
-                if (this.WebSocketClientService.customer && !NoderedUtil.IsNullEmpty(this.WebSocketClientService.customer._id)) {
-                    query["customerid"] = this.WebSocketClientService.customer._id;
-                }
+            // if (this.collection == "users" && (this.basequery._type == "user" || this.basequery._type == "role") && !this.skipcustomerfilter && this.WebSocketClientService.multi_tenant) {
+            //     // if (!NoderedUtil.IsNullUndefinded(this.WebSocketClientService.customer) && !this.skipcustomerfilter) {
+            //     //     basequeryas = this.WebSocketClientService.customer._id;
+            //     // }
+            //     if (this.WebSocketClientService.customer && !NoderedUtil.IsNullEmpty(this.WebSocketClientService.customer._id)) {
+            //         query["customerid"] = this.WebSocketClientService.customer._id;
+            //     }
+            // }
+            if (this.WebSocketClientService.multi_tenant && !NoderedUtil.IsNullUndefinded(this.WebSocketClientService.customer) && !this.skipcustomerfilter) {
+                basequeryas = this.WebSocketClientService.customer._id;
             }
+
             let orderby = this.orderby;
             if (this.lastsearchstring !== this.searchstring) {
                 this.models = [];
@@ -761,9 +804,26 @@ export class entitiesCtrl<T> {
     async DeleteOne(model: any): Promise<any> {
         this.loading = true;
         this.errormessage = "";
+        if (!this.$scope.$$phase) { this.$scope.$apply(); }
         try {
-            await NoderedUtil.DeleteOne({ collectionname: this.collection, id: model._id });
+            let recursive: boolean = false;
+            if (this.collection == "users" && (model._type == "user" || model._type == "customer")) {
+                if (this.shiftdown == true) {
+                    if (confirm("Confirm you want to HARD delete " + model.name + "\nWill delete all associated data") == true) {
+                        recursive = true;
+                    } else {
+                        event.preventDefault();
+                        return;
+                    }
+                }
+            }
+            await NoderedUtil.DeleteOne({ collectionname: this.collection, id: model._id, recursive });
+            var oldcount = this.models.length;
             this.models = this.models.filter(function (m: any): boolean { return m._id !== model._id; });
+            if (this.models.length < oldcount && oldcount < 5) {
+                this.loading = false;
+                this.loadData();
+            }
         } catch (error) {
             this.errormessage = error.message ? error.message : error;
         }
diff --git a/OpenFlow/src/public/Controllers.ts b/OpenFlow/src/public/Controllers.ts
index 21e548a4..45fcecde 100644
--- a/OpenFlow/src/public/Controllers.ts
+++ b/OpenFlow/src/public/Controllers.ts
@@ -111,7 +111,17 @@ export class MenuCtrl {
 
             this.customer = this.WebSocketClientService.customer;
 
-            this.customers = await NoderedUtil.Query({ collectionname: "users", query: { _type: "customer" }, orderby: { "name": 1 } });
+            this.customers = await NoderedUtil.Query({ collectionname: "users", query: { _type: "customer" }, orderby: { "name": 1 }, top: 20 });
+            if (!NoderedUtil.IsNullEmpty(this.user.selectedcustomerid)) {
+                if (this.customers.filter(x => x._id == this.user.selectedcustomerid).length == 0) {
+                    this.customers = (await NoderedUtil.Query({ collectionname: "users", query: { _type: "customer", _id: this.user.selectedcustomerid } })).concat(this.customers);
+                }
+            }
+            if (!NoderedUtil.IsNullEmpty(this.user.customerid)) {
+                if (this.customers.filter(x => x._id == this.user.customerid).length == 0) {
+                    this.customers = (await NoderedUtil.Query({ collectionname: "users", query: { _type: "customer", _id: this.user.customerid } })).concat(this.customers);
+                }
+            }
             if (!this.$scope.$$phase) { this.$scope.$apply(); }
             this.StartNewFeaturesTour(null);
         });
@@ -124,7 +134,17 @@ export class MenuCtrl {
                 this.customer = null;
             } else {
                 this.customer = this.WebSocketClientService.customer;
-                this.customers = await NoderedUtil.Query({ collectionname: "users", query: { _type: "customer" }, orderby: { "name": 1 } });
+                this.customers = await NoderedUtil.Query({ collectionname: "users", query: { _type: "customer" }, orderby: { "name": 1 }, top: 20 });
+                if (!NoderedUtil.IsNullEmpty(this.user.selectedcustomerid)) {
+                    if (this.customers.filter(x => x._id == this.user.selectedcustomerid).length == 0) {
+                        this.customers = (await NoderedUtil.Query({ collectionname: "users", query: { _type: "customer", _id: this.user.selectedcustomerid } })).concat(this.customers);
+                    }
+                }
+                if (!NoderedUtil.IsNullEmpty(this.user.customerid)) {
+                    if (this.customers.filter(x => x._id == this.user.customerid).length == 0) {
+                        this.customers = (await NoderedUtil.Query({ collectionname: "users", query: { _type: "customer", _id: this.user.customerid } })).concat(this.customers);
+                    }
+                }
                 if (this.customers && this.customers.length > 0) {
                     for (let cust of this.customers) {
                         if (cust._id == this.user.selectedcustomerid) {
@@ -149,7 +169,17 @@ export class MenuCtrl {
         this.$scope.$on('menurefresh', async (event, data) => {
             if (event && data) { }
             this.customer = this.WebSocketClientService.customer;
-            this.customers = await NoderedUtil.Query({ collectionname: "users", query: { _type: "customer" }, orderby: { "name": 1 } });
+            this.customers = await NoderedUtil.Query({ collectionname: "users", query: { _type: "customer" }, orderby: { "name": 1 }, top: 20 });
+            if (!NoderedUtil.IsNullEmpty(this.user.selectedcustomerid)) {
+                if (this.customers.filter(x => x._id == this.user.selectedcustomerid).length == 0) {
+                    this.customers = (await NoderedUtil.Query({ collectionname: "users", query: { _type: "customer", _id: this.user.selectedcustomerid } })).concat(this.customers);
+                }
+            }
+            if (!NoderedUtil.IsNullEmpty(this.user.customerid)) {
+                if (this.customers.filter(x => x._id == this.user.customerid).length == 0) {
+                    this.customers = (await NoderedUtil.Query({ collectionname: "users", query: { _type: "customer", _id: this.user.customerid } })).concat(this.customers);
+                }
+            }
             if (this.customers.length > 0) {
                 for (let cust of this.customers)
                     if (cust._id == this.user.selectedcustomerid) this.customer = cust;
@@ -206,6 +236,9 @@ export class MenuCtrl {
     toggleDarkMode() {
         this.halfmoon.toggleDarkMode();
     }
+    toggleSidebar() {
+        this.halfmoon.toggleSidebar();
+    }
     Search() {
         this.$rootScope.$broadcast("search", this.searchstring);
     }
@@ -2122,7 +2155,28 @@ export class LoginCtrl {
         }
         return "";
     }
-
+    usernameblur() {
+        if (!NoderedUtil.IsNullEmpty(this.username) && this.username.indexOf("@") > -1) {
+            var domain = this.username.substr(this.username.indexOf("@") + 1);
+            if (this.WebSocketClientService.forceddomains && Array.isArray(this.WebSocketClientService.forceddomains)) {
+                for (let d = 0; d < this.WebSocketClientService.forceddomains.length; d++) {
+                    let forceddomain = new RegExp(this.WebSocketClientService.forceddomains[d], "i");
+                    if (forceddomain.test(domain)) {
+                        console.log("domain found in forceddomains");
+                        document.getElementById("password").style.display = "none";
+                        document.getElementById("localbuttons").style.display = "none";
+                        this.message = "Please use provider button to login with this domain";
+                        if (!this.$scope.$$phase) { this.$scope.$apply(); }
+                        return;
+                    }
+                }
+            }
+        }
+        this.message = "";
+        if (!this.$scope.$$phase) { this.$scope.$apply(); }
+        document.getElementById("password").style.display = "block";
+        document.getElementById("localbuttons").style.display = "block";
+    }
 }
 export class ProvidersCtrl extends entitiesCtrl<Provider> {
     constructor(
@@ -2139,12 +2193,14 @@ export class ProvidersCtrl extends entitiesCtrl<Provider> {
         console.debug("ProvidersCtrl");
         this.basequery = { _type: "provider" };
         this.collection = "config";
+        this.skipcustomerfilter = true;
         WebSocketClientService.onSignedin((user: TokenUser) => {
             this.loadData();
         });
     }
 }
 export class ProviderCtrl extends entityCtrl<Provider> {
+    public newforceddomain: string = "";
     constructor(
         public $rootScope: ng.IRootScopeService,
         public $scope: ng.IScope,
@@ -2186,6 +2242,23 @@ export class ProviderCtrl extends entityCtrl<Provider> {
         }
         if (!this.$scope.$$phase) { this.$scope.$apply(); }
     }
+    deleteforceddomains(id) {
+        if ((this.model as any).forceddomains === null || (this.model as any).forceddomains === undefined) {
+            (this.model as any).forceddomains = [];
+        }
+        (this.model as any).forceddomains = (this.model as any).forceddomains.filter(function (m: any): boolean { return m !== id; });
+    }
+    addforceddomains() {
+        if ((this.model as any).forceddomains === null || (this.model as any).forceddomains === undefined) {
+            (this.model as any).forceddomains = [];
+        }
+        var v = this.newforceddomain;
+        try {
+            v = JSON.parse(v);
+        } catch (error) {
+        }
+        (this.model as any).forceddomains.push(v);
+    }
 }
 export class UsersCtrl extends entitiesCtrl<TokenUser> {
     public stripe: any = null;
@@ -2257,28 +2330,6 @@ export class UsersCtrl extends entitiesCtrl<TokenUser> {
         this.loading = false;
         if (!this.$scope.$$phase) { this.$scope.$apply(); }
     }
-    async DeleteOneUser(model: TokenUser): Promise<any> {
-        try {
-            this.errormessage = "";
-            this.loading = true;
-            await NoderedUtil.DeleteOne({ collectionname: this.collection, id: model._id });
-            this.models = this.models.filter(function (m: any): boolean { return m._id !== model._id; });
-            this.loading = false;
-            let name = model.username;
-            name = name.split("@").join("").split(".").join("");
-            name = name.toLowerCase();
-
-            var query = { _type: "role", "$or": [{ name: name + "noderedadmins" }, { name: name + "nodered api users" }] }
-            const list = await NoderedUtil.Query({ collectionname: "users", query, top: 4 });
-            for (var i = 0; i < list.length; i++) {
-                console.debug("Deleting " + list[i].name)
-                await NoderedUtil.DeleteOne({ collectionname: "users", id: list[i]._id });
-            }
-        } catch (error) {
-            this.errormessage = error;
-        }
-        if (!this.$scope.$$phase) { this.$scope.$apply(); }
-    }
     public Resources: Resource[];
     public Assigned: ResourceUsage[];
     public user: TokenUser;
@@ -2750,40 +2801,6 @@ export class RoleCtrl extends entityCtrl<Role> {
         });
     }
 }
-export class SocketCtrl {
-    public static $inject = [
-        "$scope",
-        "$location",
-        "$routeParams",
-        "WebSocketClientService",
-        "api"
-    ];
-    public messages: string = "";
-    public queuename: string = "webtest";
-    public message: string = "Hi mom";
-    constructor(
-        public $scope: ng.IScope,
-        public $location: ng.ILocationService,
-        public $routeParams: ng.route.IRouteParamsService,
-        public WebSocketClientService: WebSocketClientService,
-        public api: api
-    ) {
-        console.debug("SocketCtrl");
-        WebSocketClientService.onSignedin(async (user: TokenUser) => {
-            await this.RegisterQueue();
-        });
-    }
-    async RegisterQueue() {
-        await NoderedUtil.RegisterQueue({
-            callback: (data: QueueMessage, ack: any) => {
-            ack();
-            }, closedcallback: (msg) => {
-            this.queuename = "";
-            setTimeout(this.RegisterQueue.bind(this), (Math.floor(Math.random() * 6) + 1) * 500);
-            }
-        });
-    }
-}
 export class FilesCtrl extends entitiesCtrl<Base> {
     public file: string;
     constructor(
@@ -2997,12 +3014,141 @@ export class FormsCtrl extends entitiesCtrl<Base> {
         console.debug("FormsCtrl");
         this.autorefresh = true;
         this.collection = "forms";
+        this.basequery = { "_type": "form" }
         this.baseprojection = { _type: 1, type: 1, name: 1, _created: 1, _createdby: 1, _modified: 1 };
         WebSocketClientService.onSignedin((user: TokenUser) => {
             this.loadData();
         });
     }
 }
+export class FormResourcesCtrl extends entitiesCtrl<Base> {
+    constructor(
+        public $rootScope: ng.IRootScopeService,
+        public $scope: ng.IScope,
+        public $location: ng.ILocationService,
+        public $routeParams: ng.route.IRouteParamsService,
+        public $interval: ng.IIntervalService,
+        public WebSocketClientService: WebSocketClientService,
+        public api: api,
+        public userdata: userdata
+    ) {
+        super($rootScope, $scope, $location, $routeParams, $interval, WebSocketClientService, api, userdata);
+        console.debug("FormsCtrl");
+        this.autorefresh = true;
+        this.collection = "forms";
+        this.basequery = { "_type": "resource" }
+        this.baseprojection = { _type: 1, type: 1, name: 1, _created: 1, _createdby: 1, _modified: 1 };
+        WebSocketClientService.onSignedin((user: TokenUser) => {
+            this.loadData();
+        });
+    }
+}
+export class FormResourceCtrl extends entityCtrl<Base> {
+    public newforceddomain: string = "";
+    public collections: any[];
+    constructor(
+        public $rootScope: ng.IRootScopeService,
+        public $scope: ng.IScope,
+        public $location: ng.ILocationService,
+        public $routeParams: ng.route.IRouteParamsService,
+        public $interval: ng.IIntervalService,
+        public WebSocketClientService: WebSocketClientService,
+        public api: api,
+        public userdata: userdata
+    ) {
+        super($rootScope, $scope, $location, $routeParams, $interval, WebSocketClientService, api, userdata);
+        console.debug("FormResourceCtrl");
+        this.collection = "forms";
+        this.postloadData = this.postload;
+        WebSocketClientService.onSignedin(async (user: TokenUser) => {
+            this.collections = await NoderedUtil.ListCollections({});
+            if (this.id !== null && this.id !== undefined) {
+                this.loadData();
+            } else {
+                try {
+                    this.model = new Base()
+                    this.model._type = "resource";
+                    // @ts-ignore
+                    this.model.collection = "entities"
+                    this.model.name = "entities"
+                    // @ts-ignore
+                    this.model.aggregates = [{ "$match": {} }, { "$project": { "name": 1, "_type": 1 } }];
+                } catch (error) {
+                    this.model = {} as any;
+                    this.model.name = "ente";
+                    this.model._type = "resource";
+                    // @ts-ignore
+                    this.model.collection = "entities"
+                    this.model.name = "entities"
+                    // @ts-ignore
+                    this.model.aggregates = [{ "$match": {} }, { "$project": { "name": 1, "_type": 1 } }];
+                }
+                if (!this.$scope.$$phase) { this.$scope.$apply(); }
+                this.fixtextarea()
+            }
+        });
+    }
+    collapsobject(o) {
+        const keys = Object.keys(o);
+        for (let i = 0; i < keys.length; i++) {
+            let key = keys[i];
+            if (key.startsWith("$")) {
+                let newkey = "___" + key.substr(1);
+                o[newkey] = o[key];
+                delete o[key];
+                key = newkey;
+            }
+            if (typeof (o[key]) === "object") {
+                this.collapsobject(o[key]);
+            }
+        }
+    }
+    expandobject(o) {
+        const keys = Object.keys(o);
+        for (let i = 0; i < keys.length; i++) {
+            let key = keys[i];
+            if (key.startsWith("___")) {
+                let newkey = "$" + key.substr(3);
+                o[newkey] = o[key];
+                delete o[key];
+                key = newkey;
+            }
+            if (typeof (o[key]) === "object") {
+                this.expandobject(o[key]);
+            }
+        }
+    }
+    postload() {
+        if (this.model) {
+            this.expandobject(this.model);
+        }
+        if (!this.$scope.$$phase) { this.$scope.$apply(); }
+        this.fixtextarea()
+    }
+    async submit(): Promise<void> {
+        try {
+            this.collapsobject(this.model);
+            if (this.model._id) {
+                await NoderedUtil.UpdateOne({ collectionname: this.collection, item: this.model });
+            } else {
+                await NoderedUtil.InsertOne({ collectionname: this.collection, item: this.model });
+            }
+            this.$location.path("/FormResources");
+        } catch (error) {
+            this.errormessage = error.message ? error.message : error;
+        }
+        if (!this.$scope.$$phase) { this.$scope.$apply(); }
+    }
+    fixtextarea() {
+        setTimeout(() => {
+            const tx = document.getElementsByTagName('textarea');
+            for (let i = 0; i < tx.length; i++) {
+                tx[i].setAttribute('style', 'height:' + (tx[i].scrollHeight) + 'px;overflow-y:hidden;');
+            }
+        }, 500);
+    }
+
+}
 export class EditFormCtrl extends entityCtrl<Form> {
     public message: string = "";
     public charts: chartset[] = [];
@@ -3037,6 +3183,7 @@ export class EditFormCtrl extends entityCtrl<Form> {
                         this.model = {} as any;
                         this.model._type = "form";
                         this.model.dataType = "json";
+                        this.model.formData = { "display": "form" };
                     }
                     this.model.fbeditor = false;
                     this.renderform();
@@ -3051,6 +3198,9 @@ export class EditFormCtrl extends entityCtrl<Form> {
             // allready there
         }
         try {
+            console.log(this.model);
+            delete this.model.schema.changed
+            console.log(this.model);
             if (this.model._id) {
                 this.model = await NoderedUtil.UpdateOne({ collectionname: this.collection, item: this.model });
             } else {
@@ -3111,12 +3261,11 @@ export class EditFormCtrl extends entityCtrl<Form> {
                 console.error(error);
             }
             if (this.model.formData == null || this.model.formData == undefined) { this.model.formData = {}; }
-            // "https://examples.form.io/wizard"
-            if (this.model.wizard == true) {
-                this.model.formData.display = "wizard";
-            } else {
-                this.model.formData.display = "form";
-            }
+            if (NoderedUtil.IsNullEmpty(this.model.formData.display)) this.model.formData.display = "form";
+            let protocol = "http:";
+            if (this.WebSocketClientService.wsurl.startsWith("wss")) protocol = "https:";
+            Formio.setBaseUrl(protocol + '//' + this.WebSocketClientService.domain);
+            Formio.setProjectUrl(protocol + '//' + this.WebSocketClientService.domain);
             this.Formiobuilder = await Formio.builder(document.getElementById('builder'), this.model.formData,
                 {
                     noAlerts: false,
@@ -3286,10 +3435,13 @@ export class FormCtrl extends entityCtrl<WorkflowInstance> {
     }
     async hideFormElements() {
         console.debug("hideFormElements");
+
+        $('input[ref="component"]').prop("disabled", true);
         $('#workflowform :input').prop("disabled", true);
         $('#workflowform :button').prop("disabled", true);
         $('#workflowform :input').addClass("disabled");
         $('#workflowform :button').addClass("disabled");
+        $('#workflowform choices__list').hide();
         $('#workflowform .form-group').addClass("is-disabled");
         $('#workflowform .form-group').prop("isDisabled", true);
 
@@ -3311,7 +3463,6 @@ export class FormCtrl extends entityCtrl<WorkflowInstance> {
             console.error(this.errormessage);
             return;
         }
-        // this.RegisterExchange(this.workflow.queue);
         if (this.instanceid !== null && this.instanceid !== undefined && this.instanceid !== "") {
             const res = await NoderedUtil.Query({ collectionname: "workflow_instances", query: { _id: this.instanceid }, orderby: { _created: -1 }, top: 1 });
             if (res.length > 0) { this.model = res[0]; } else {
@@ -3320,9 +3471,6 @@ export class FormCtrl extends entityCtrl<WorkflowInstance> {
                 console.error(this.errormessage);
                 return;
             }
-            // console.debug(this.model);
-            // console.debug(this.model.form);
-            // console.debug("form: " + this.model.form);
             if (this.model.payload === null || this.model.payload === undefined) {
                 this.model.payload = { _id: this.instanceid };
             }
@@ -3331,8 +3479,9 @@ export class FormCtrl extends entityCtrl<WorkflowInstance> {
             }
 
 
-            if (this.model.form === "none" || this.model.form === "" || this.model.state == "processing") {
-                if (this.model.state != "failed" && this.model.state != "processing") {
+            if (this.model.form === "none" || this.model.form === "") {
+                console.debug("workflow_instances has no form set, state " + this.model.state);
+                if (this.model.state != "failed") {
                     this.$location.path("/main");
                 } else {
                     this.hideFormElements();
@@ -3426,7 +3575,6 @@ export class FormCtrl extends entityCtrl<WorkflowInstance> {
         } else {
 
         }
-        // console.debug("SendOne: " + this.workflow._id + " / " + this.workflow.queue);
         this.model.payload._id = this.instanceid;
         try {
             await this.SendOne(this.workflow.queue, this.model.payload);
@@ -3435,7 +3583,6 @@ export class FormCtrl extends entityCtrl<WorkflowInstance> {
             if (!this.$scope.$$phase) { this.$scope.$apply(); }
             console.error(this.errormessage);
         }
-        // this.loadData();
     }
     traversecomponentsPostProcess(components: any[], data: any) {
         for (let i = 0; i < components.length; i++) {
@@ -3463,6 +3610,7 @@ export class FormCtrl extends entityCtrl<WorkflowInstance> {
 
     }
     traversecomponentsMakeDefaults(components: any[]) {
+        if (!components) return;
         for (let y = 0; y < components.length; y++) {
             const item = components[y];
             if (item.type == "datagrid") {
@@ -3554,6 +3702,7 @@ export class FormCtrl extends entityCtrl<WorkflowInstance> {
         }
     }
     traversecomponentsAddCustomValidate(components: any[]) {
+        if (!components) return;
         for (let y = 0; y < components.length; y++) {
             const item = components[y];
             if (item.type == "file") {
@@ -3569,12 +3718,13 @@ export class FormCtrl extends entityCtrl<WorkflowInstance> {
         next();
     }
     async renderform() {
+
         if (this.form.fbeditor == null || this.form.fbeditor == undefined) this.form.fbeditor = true;
         if ((this.form.fbeditor as any) == "true") this.form.fbeditor = true;
         if ((this.form.fbeditor as any) == "false") this.form.fbeditor = false;
         if (!this.$scope.$$phase) { this.$scope.$apply(); }
         if (this.form.fbeditor === true) {
-            console.debug("renderform");
+            console.debug("renderform fbeditor");
             const roles: any = {};
             WebSocketClient.instance.user.roles.forEach(role => {
                 roles[role._id] = role.name;
@@ -3654,6 +3804,16 @@ export class FormCtrl extends entityCtrl<WorkflowInstance> {
             }
             this.formRender = ele.formRender(formRenderOpts);
         } else {
+            console.debug("renderform formio", this.form.schema?.components);
+            if (!this.form.schema || !this.form.schema.components || this.form.schema.components.length == 0) {
+                if (this.form.formData && this.form.formData.components && this.form.formData.components.length > 0) {
+                    console.warn("schema has no components, but forData does, using form formData.components instead")
+                    this.form.schema.components = this.form.formData.components;
+                }
+            }
+            if (!this.form.schema || !this.form.schema.components || this.form.schema.components.length == 0) {
+                console.error("Form has no schema ( components ) !", this.form)
+            }
             try {
                 const test = Formio.builder;
             } catch (error) {
@@ -3679,6 +3839,10 @@ export class FormCtrl extends entityCtrl<WorkflowInstance> {
             } else {
                 this.form.schema.display = "form";
             }
+            let protocol = "http:";
+            if (this.WebSocketClientService.wsurl.startsWith("wss")) protocol = "https:";
+            Formio.setBaseUrl(protocol + '//' + this.WebSocketClientService.domain);
+            Formio.setProjectUrl(protocol + '//' + this.WebSocketClientService.domain);
 
             this.formioRender = await Formio.createForm(document.getElementById('formio'), this.form.schema,
                 {
@@ -3715,6 +3879,11 @@ export class FormCtrl extends entityCtrl<WorkflowInstance> {
                 console.error(this.errormessage);
             });
         }
+        if (this.model.state == "processing") {
+            this.hideFormElements();
+            this.message = "Processing . . .";
+            if (!this.$scope.$$phase) { this.$scope.$apply(); }
+        }
         if (this.model.state == "completed" || this.model.state == "failed") {
             this.hideFormElements();
             if (this.model.state == "failed") {
@@ -3734,51 +3903,6 @@ export class FormCtrl extends entityCtrl<WorkflowInstance> {
         if (!this.$scope.$$phase) { this.$scope.$apply(); }
     }
 
-}
-export class jslogCtrl extends entitiesCtrl<Base> {
-    public message: string = "";
-    public charts: chartset[] = [];
-    constructor(
-        public $rootScope: ng.IRootScopeService,
-        public $scope: ng.IScope,
-        public $location: ng.ILocationService,
-        public $routeParams: ng.route.IRouteParamsService,
-        public $interval: ng.IIntervalService,
-        public WebSocketClientService: WebSocketClientService,
-        public api: api,
-        public userdata: userdata
-    ) {
-        super($rootScope, $scope, $location, $routeParams, $interval, WebSocketClientService, api, userdata);
-        this.autorefresh = true;
-        console.debug("jslogCtrl");
-        this.searchfields = ["_createdby", "host", "message"];
-        this.collection = "jslog";
-        this.basequery = {};
-        this.baseprojection = { _type: 1, type: 1, host: 1, message: 1, name: 1, _created: 1, _createdby: 1, _modified: 1 };
-        WebSocketClientService.onSignedin((user: TokenUser) => {
-            this.loadData();
-        });
-    }
-    async DeleteMany(): Promise<void> {
-        this.loading = true;
-        const Promises: Promise<void>[] = [];
-        this.models.forEach(model => {
-            Promises.push(NoderedUtil.DeleteOne({ collectionname: this.collection, id: model._id }));
-        });
-        const results: any = await Promise.all(Promises.map(p => p.catch(e => e)));
-        // const values: void[] = results.filter(result => !(result instanceof Error));
-        // const ids: string[] = [];
-        // values.forEach((x: void) => ids.push(x._id));
-        // this.models = this.models.filter(function (m: any): boolean { return ids.indexOf(m._id) === -1; });
-        // this.loading = false;
-
-        this.models = await NoderedUtil.Query({ collectionname: this.collection, query: this.basequery, projection: this.baseprojection, orderby: this.orderby });
-        if (!this.$scope.$$phase) { this.$scope.$apply(); }
-        if (this.models.length > 0) {
-            await this.DeleteMany();
-        }
-    }
-
 }
 export class EntityCtrl extends entityCtrl<Base> {
     searchFilteredList: TokenUser[] = [];
@@ -4356,7 +4480,7 @@ export class NoderedCtrl {
 
             if (this.user.nodered == null) this.user.nodered = {} as any;
             if ((this.user.nodered as any).monaco == null) (this.user.nodered as any).monaco = false;
-            if ((this.user.nodered as any).tours == null) (this.user.nodered as any).tours = WebSocketClientService.enable_web_tours;
+            if ((this.user.nodered as any).tours == null) (this.user.nodered as any).tours = WebSocketClientService.enable_nodered_tours;
             if (this.user.nodered.function_external_modules == null) this.user.nodered.function_external_modules = true;
 
             this.user.nodered.nodered_image_name = this.user.nodered.nodered_image_name || WebSocketClientService.nodered_images[0].name;
@@ -4615,6 +4739,7 @@ export class hdrobotsCtrl extends entitiesCtrl<unattendedclient> {
         console.debug("RolesCtrl");
         this.basequery = { _type: "unattendedclient" };
         this.collection = "openrpa";
+        this.skipcustomerfilter = true;
         WebSocketClientService.onSignedin((user: TokenUser) => {
             this.loadData();
         });
@@ -4810,222 +4935,7 @@ export class AuditlogsCtrl extends entitiesCtrl<Role> {
 
     }
 }
-export class SignupCtrl extends entityCtrl<Base> {
-    searchFilteredList: TokenUser[] = [];
-    searchSelectedItem: TokenUser = null;
-    searchtext: string = "";
-    e: any = null;
-
-    public newkey: string = "";
-    public showjson: boolean = false;
-    public jsonmodel: string = "";
-    public message: string = "";
-    constructor(
-        public $rootScope: ng.IRootScopeService,
-        public $scope: ng.IScope,
-        public $location: ng.ILocationService,
-        public $routeParams: ng.route.IRouteParamsService,
-        public $interval: ng.IIntervalService,
-        public WebSocketClientService: WebSocketClientService,
-        public api: api,
-        public userdata: userdata
-    ) {
-        super($rootScope, $scope, $location, $routeParams, $interval, WebSocketClientService, api, userdata);
-        console.debug("SignupCtrl");
-        this.collection = $routeParams.collection;
-        this.postloadData = this.processdata;
-        WebSocketClientService.onConnected(async () => {
-            if (this.id !== null && this.id !== undefined) {
-                await this.loadData();
-            } else {
-                this.processdata();
-            }
-        });
-    }
-    processdata() {
-        if (!this.$scope.$$phase) { this.$scope.$apply(); }
-    }
-}
 declare const Stripe: any;
-export class QueuesCtrl extends entitiesCtrl<Base> {
-    public message: string = "";
-    public charts: chartset[] = [];
-    constructor(
-        public $rootScope: ng.IRootScopeService,
-        public $scope: ng.IScope,
-        public $location: ng.ILocationService,
-        public $routeParams: ng.route.IRouteParamsService,
-        public $interval: ng.IIntervalService,
-        public WebSocketClientService: WebSocketClientService,
-        public api: api,
-        public userdata: userdata
-    ) {
-        super($rootScope, $scope, $location, $routeParams, $interval, WebSocketClientService, api, userdata);
-        this.collection = "configclients";
-        this.basequery = { _type: "queue" };
-        console.debug("QueuesCtrl");
-        WebSocketClientService.onSignedin((user: TokenUser) => {
-            this.loadData();
-        });
-    }
-    async DumpRabbitmq() {
-        try {
-            this.loading = true;
-            let m: Message = new Message();
-            m.command = "dumprabbitmq"; m.data = "{}";
-            const q = await WebSocketClient.instance.Send<any>(m, 1);
-            if ((q as any).command == "error") throw new Error(q.data);
-        } catch (error) {
-            console.error(error);
-        }
-        this.loading = false;
-        this.loadData();
-    }
-}
-export class QueueCtrl extends entityCtrl<Base> {
-    public newid: string;
-    public memberof: Role[];
-    public data: any;
-    constructor(
-        public $rootScope: ng.IRootScopeService,
-        public $scope: ng.IScope,
-        public $location: ng.ILocationService,
-        public $routeParams: ng.route.IRouteParamsService,
-        public $interval: ng.IIntervalService,
-        public WebSocketClientService: WebSocketClientService,
-        public api: api,
-        public userdata: userdata
-    ) {
-        super($rootScope, $scope, $location, $routeParams, $interval, WebSocketClientService, api, userdata);
-        console.debug("QueueCtrl");
-        this.collection = "configclients";
-        this.postloadData = this.processdata;
-        this.memberof = [];
-        WebSocketClientService.onSignedin((user: TokenUser) => {
-            if (this.id !== null && this.id !== undefined) {
-                this.loadData();
-            } else {
-                this.model = new Base();
-                this.model._type = "queue";
-                this.model.name = "";
-                this.processdata();
-            }
-
-        });
-    }
-    async processdata() {
-        try {
-            if (this.model == null) {
-                this.errormessage = "Not found!";
-                this.loading = false;
-                if (!this.$scope.$$phase) { this.$scope.$apply(); }
-                return;
-            }
-            this.loading = true;
-            let m: Message = new Message();
-            m.command = "getrabbitmqqueue"; m.data = "{\"name\": \"" + (this.model as any).queuename + "\"}";
-            const q = await WebSocketClient.instance.Send<any>(m, 2);
-            if ((q as any).command == "error") throw new Error(q.data);
-            this.data = q.data;
-            if (this.data == null) {
-                this.errormessage = "Queue not found!";
-                this.loading = false;
-                if (!this.$scope.$$phase) { this.$scope.$apply(); }
-                return;
-            }
-            if (this.data.consumer_details == null || this.data.consumer_details.length == 0) {
-                this.errormessage = "Queue has no consumers!";
-                this.loading = false;
-                if (!this.$scope.$$phase) { this.$scope.$apply(); }
-                return;
-            }
-            this.collection = "configclients";
-            this.basequery = { _type: "socketclient" };
-            const clients = await NoderedUtil.Query({ collectionname: "configclients", query: { _type: "socketclient" }, top: 2000 });
-            for (let i = 0; i < this.data.consumer_details.length; i++) {
-                for (let y = 0; y < clients.length; y++) {
-                    const _client = clients[y];
-                    if (_client.queues != null) {
-                        for (let z = 0; z < _client.queues.length; z++) {
-                            const q = _client.queues[z];
-                            if (q.consumerTag == this.data.consumer_details[i].consumer_tag) {
-                                this.data.consumer_details[i].clientname = _client.name;
-                            }
-                        }
-                    }
-
-                }
-
-            }
-        } catch (error) {
-            console.error(error);
-        }
-        this.loading = false;
-        if (!this.$scope.$$phase) { this.$scope.$apply(); }
-    }
-    async DeleteQueue(model) {
-        try {
-            this.loading = true;
-            let m: Message = new Message();
-            m.command = "deleterabbitmqqueue"; m.data = "{\"name\": \"" + (this.model as any).queuename + "\"}";
-            const q = await WebSocketClient.instance.Send<any>(m, 1);
-            if ((q as any).command == "error") throw new Error(q.data);
-            this.data = q.data;
-            this.$location.path("/Queues");
-        } catch (error) {
-            this.errormessage = error.message ? error.message : error;
-            console.error(error);
-        }
-        this.loading = false;
-        if (!this.$scope.$$phase) { this.$scope.$apply(); }
-    }
-
-}
-export class SocketsCtrl extends entitiesCtrl<Base> {
-    public message: string = "";
-    public charts: chartset[] = [];
-    constructor(
-        public $rootScope: ng.IRootScopeService,
-        public $scope: ng.IScope,
-        public $location: ng.ILocationService,
-        public $routeParams: ng.route.IRouteParamsService,
-        public $interval: ng.IIntervalService,
-        public WebSocketClientService: WebSocketClientService,
-        public api: api,
-        public userdata: userdata
-    ) {
-        super($rootScope, $scope, $location, $routeParams, $interval, WebSocketClientService, api, userdata);
-        this.collection = "configclients";
-        this.basequery = { _type: "socketclient" };
-        console.debug("SocketsCtrl");
-        this.postloadData = this.processdata;
-        WebSocketClientService.onSignedin((user: TokenUser) => {
-            this.loadData();
-        });
-    }
-    processdata() {
-        for (let i = 0; i < this.models.length; i++) {
-            const model: any = this.models[i];
-            model.keys = Object.keys(model.queues);
-            model.queuescount = model.keys.length;
-        }
-        this.loading = false;
-        if (!this.$scope.$$phase) { this.$scope.$apply(); }
-    }
-    async DumpClients() {
-        try {
-            this.loading = true;
-            let m: Message = new Message();
-            m.command = "dumpclients"; m.data = "{}";
-            const q = await WebSocketClient.instance.Send<any>(m, 1);
-            if ((q as any).command == "error") throw new Error(q.data);
-        } catch (error) {
-            console.error(error);
-        }
-        this.loading = false;
-        this.loadData();
-    }
-}
 export class CredentialsCtrl extends entitiesCtrl<Base> {
     constructor(
         public $rootScope: ng.IRootScopeService,
@@ -5361,6 +5271,7 @@ export class OAuthClientsCtrl extends entitiesCtrl<Base> {
         this.collection = "config";
         this.searchfields = ["name", "username"];
         this.postloadData = this.processData;
+        this.skipcustomerfilter = true;
         if (this.userdata.data.OAuthClientsCtrl) {
             this.basequery = this.userdata.data.OAuthClientsCtrl.basequery;
             this.collection = this.userdata.data.OAuthClientsCtrl.collection;
@@ -5629,7 +5540,7 @@ export class DuplicatesCtrl extends entitiesCtrl<Base> {
             const item = (this.models[x] as any);
             ids.push(item.items[0]._id);
         }
-        await NoderedUtil.DeleteMany({ collectionname: this.collection, ids });
+        if (ids.length > 0) await NoderedUtil.DeleteMany({ collectionname: this.collection, ids });
         this.loading = false;
         this.loadData();
     }
@@ -5642,7 +5553,7 @@ export class DuplicatesCtrl extends entitiesCtrl<Base> {
                 ids.push(item.items[y]._id);
             }
         }
-        await NoderedUtil.DeleteMany({ collectionname: this.collection, ids });
+        if (ids.length > 0) await NoderedUtil.DeleteMany({ collectionname: this.collection, ids });
         this.loading = false;
         this.loadData();
     }
@@ -5655,7 +5566,7 @@ export class DuplicatesCtrl extends entitiesCtrl<Base> {
                 ids.push(item.items[y]._id);
             }
         }
-        await NoderedUtil.DeleteMany({ collectionname: this.collection, ids });
+        if (ids.length > 0) await NoderedUtil.DeleteMany({ collectionname: this.collection, ids });
         this.loading = false;
         this.loadData();
     }
@@ -5676,7 +5587,7 @@ export class DuplicatesCtrl extends entitiesCtrl<Base> {
         for (let i = 1; i < model.items.length; i++) {
             ids.push(model.items[i]._id);
         }
-        await NoderedUtil.DeleteMany({ collectionname: this.collection, ids });
+        if (ids.length > 0) await NoderedUtil.DeleteMany({ collectionname: this.collection, ids });
         this.loading = false;
         this.loadData();
     }
@@ -5688,7 +5599,7 @@ export class DuplicatesCtrl extends entitiesCtrl<Base> {
         for (let i = 0; i < model.items.length; i++) {
             ids.push(model.items[i]._id);
         }
-        await NoderedUtil.DeleteMany({ collectionname: this.collection, ids });
+        if (ids.length > 0) await NoderedUtil.DeleteMany({ collectionname: this.collection, ids });
         this.loading = false;
         this.loadData();
     }
@@ -5824,6 +5735,7 @@ export class CustomersCtrl extends entitiesCtrl<Provider> {
         console.debug("CustomersCtrl");
         this.basequery = { _type: "customer" };
         this.collection = "users";
+        this.skipcustomerfilter = true;
         WebSocketClientService.onSignedin((user: TokenUser) => {
             this.loadData();
         });
@@ -5863,12 +5775,19 @@ export class CustomerCtrl extends entityCtrl<Customer> {
                     this.stripe = Stripe(this.WebSocketClientService.stripe_api_key);
                 }
             }
-
             if (this.id !== null && this.id !== undefined) {
+                console.debug("Loading customer id " + this.id);
                 this.loading = false;
                 this.loadData();
             } else {
                 user = TokenUser.assign(user);
+                if (user.customerid != null) {
+                    this.id = user.customerid;
+                    console.debug("Loading customer id " + this.id);
+                    this.loading = false;
+                    this.loadData();
+                    return;
+                }
                 if (!user.HasRoleName("resellers")) {
                     if (!NoderedUtil.IsNullEmpty(user.customerid)) {
                         var results = await NoderedUtil.Query({
@@ -5909,6 +5828,7 @@ export class CustomerCtrl extends entityCtrl<Customer> {
                     console.debug("Create new customer");
                 }
                 this.loading = false;
+
                 if (!this.$scope.$$phase) { this.$scope.$apply(); }
             }
         });
@@ -5954,15 +5874,20 @@ export class CustomerCtrl extends entityCtrl<Customer> {
             this.errormessage = "";
             if (this.model != null) {
                 if (WebSocketClient.instance.user.selectedcustomerid != this.model._id) {
+                    console.log("update selected customer to id #" + this.model._id)
                     WebSocketClient.instance.user.selectedcustomerid = this.model._id;
                     this.$rootScope.$broadcast("menurefresh");
+                } else {
+                    console.log("user already have selected customer id #" + this.model._id)
                 }
             }
             if (this.$routeParams.action != null) {
                 await NoderedUtil.EnsureCustomer({ customer: this.model });
             }
             this.Resources = await NoderedUtil.Query({ collectionname: "config", query: { "_type": "resource", "target": "customer", "allowdirectassign": true }, orderby: { _created: -1 } });
+            console.debug("Resources", this.Resources);
             this.Assigned = await NoderedUtil.Query({ collectionname: "config", query: { "_type": "resourceusage", "customerid": this.model._id, "userid": { "$exists": false } }, orderby: { _created: -1 } });
+            console.debug("Assigned", this.Assigned);
             for (var res of this.Resources) {
                 res.products = res.products.filter(x => x.allowdirectassign == true);
                 for (var prod of res.products) {
@@ -6224,6 +6149,7 @@ export class EntityRestrictionsCtrl extends entitiesCtrl<Base> {
         this.basequery = { _type: "restriction" };
         this.collection = "config";
         this.postloadData = this.processData;
+        this.skipcustomerfilter = true;
         if (this.userdata.data.EntityRestrictionsCtrl) {
             this.basequery = this.userdata.data.EntityRestrictionsCtrl.basequery;
             this.collection = this.userdata.data.EntityRestrictionsCtrl.collection;
@@ -6255,9 +6181,11 @@ export class EntityRestrictionsCtrl extends entitiesCtrl<Base> {
             await this.newRestriction("Create workitemqueue in mq", "mq", ["$.[?(@ && @._type == 'workitemqueue')]"], false);
             await this.newRestriction("Create workitem in workitems", "workitems", ["$.[?(@ && @._type == 'workitem')]"], false);
 
+
             await this.newRestriction("Create queues", "mq", ["$.[?(@ && @._type == 'queue')]"], false);
             await this.newRestriction("Create exchanges", "mq", ["$.[?(@ && @._type == 'exchange')]"], false);
             await this.newRestriction("Create form", "forms", ["$.[?(@ && @._type == 'form')]"], false);
+            await this.newRestriction("Create resource in forms", "forms", ["$.[?(@ && @._type == 'resource')]"], false);
             await this.newRestriction("Create workflow", "openrpa", ["$.[?(@ && @._type == 'workflow')]"], false);
             await this.newRestriction("Create project", "openrpa", ["$.[?(@ && @._type == 'project')]"], false);
             await this.newRestriction("Create detector", "openrpa", ["$.[?(@ && @._type == 'detector')]"], false);
@@ -6593,6 +6521,7 @@ export class ResourcesCtrl extends entitiesCtrl<Resource> {
         this.basequery = { _type: "resource" };
         this.collection = "config";
         this.postloadData = this.processData;
+        this.skipcustomerfilter = true;
         if (this.userdata.data.ResourcesCtrl) {
             this.basequery = this.userdata.data.ResourcesCtrl.basequery;
             this.collection = this.userdata.data.ResourcesCtrl.collection;
@@ -7266,6 +7195,7 @@ export class MailHistsCtrl extends entitiesCtrl<Role> {
         this.basequery = {};
         this.collection = "mailhist";
         this.postloadData = this.processdata;
+        this.skipcustomerfilter = true;
         this.baseprojection = { _type: 1, name: 1, _created: 1, _modified: 1, read: 1, readcount: 1, userid: 1 };
         if (this.userdata.data.MailHistsCtrl) {
             this.basequery = this.userdata.data.MailHistsCtrl.basequery;
diff --git a/OpenFlow/src/public/Customers.html b/OpenFlow/src/public/Customers.html
index c761f090..4e40b1ca 100644
--- a/OpenFlow/src/public/Customers.html
+++ b/OpenFlow/src/public/Customers.html
@@ -25,8 +25,9 @@ <h1 translate lib="web">customers</h1>
         <timesince ng-model="model._created" />
       </td>
       <td>
-        <a class="btn" ng-href="#/Customer/{{model._id}}"><em class="fas fa-edit"></em></a>
-        <a class="btn" href ng-click="ctrl.DeleteOne(model)" ng-disabled="ctrl.loading==true"><em
+        <a class="btn" ng-href="#/Customer/{{model._id}}" ng-disabled="ctrl.loading==true"><em class="fas fa-edit"></em></a>
+        <a class="btn" href ng-click="ctrl.DeleteOne(model)" ng-disabled="ctrl.loading==true"
+        ng-class="{'btn-danger': ctrl.shiftdown==true && ctrl.collection == 'users' && (model._type == 'user' || model._type == 'customer')}"><em
             class="fas fa-trash"></em></a>
       </td>
     </tr>
diff --git a/OpenFlow/src/public/Deleted.html b/OpenFlow/src/public/Deleted.html
index 9ea8c607..19753a8a 100644
--- a/OpenFlow/src/public/Deleted.html
+++ b/OpenFlow/src/public/Deleted.html
@@ -36,7 +36,7 @@ <h1 translate lib="web">deleted entities</h1>
   </thead>
   <tbody>
     <tr ng-repeat="model in ctrl.models">
-      <td><a style="color: inherit; text-decoration: inherit;" ng-href="#/History/{{model._id}}">{{model.name}}</a></td>
+      <td><a style="color: inherit; text-decoration: inherit;" ng-href="#/History/{{ctrl.collection}}/{{model._id}}">{{model.name}}</a></td>
       <td><span translate lib="web">{{model.type || model._type}}</span></td>
       <td>{{model._createdby}}</td>
       <td>
diff --git a/OpenFlow/src/public/EditForm.html b/OpenFlow/src/public/EditForm.html
index b74d23aa..071fa7ff 100644
--- a/OpenFlow/src/public/EditForm.html
+++ b/OpenFlow/src/public/EditForm.html
@@ -20,10 +20,21 @@
                 ng-disabled="ctrl.loading==true" />
         </div>
     </div>
+    <div class="form-inline" ng-show="ctrl.model.fbeditor!=true">
+        <label for="sid" class="col-sm-2 control-label" translate lib="web">formtype</label>
+        <div class="col-sm-4">
+            <select ng-model="ctrl.model.formData.display"  class="input-md" ng-change="ctrl.renderform()"
+            ng-disabled="ctrl.loading==true">
+                <option>form</option>
+                <option>wizard</option>
+                <!-- <option>pdf</option> -->
+            </select>
+        </div>
+    </div>
 </section>
 <div id="fb-editor" ng-show="ctrl.model.fbeditor==true">
 </div>
-<div ng-show="ctrl.model.fbeditor!=true">
+<!-- <div ng-show="ctrl.model.fbeditor!=true">
     <div class="form-inline">
         <label for="sid" class="col-sm-2 control-label" translate lib="web">Wizard</label>
         <div class="col-sm-4">
@@ -31,7 +42,7 @@
                 ng-disabled="ctrl.loading==true" />
         </div>
     </div>
-</div>
+</div> -->
 
 <link rel='stylesheet' href='bootstrap.css'>
 
diff --git a/OpenFlow/src/public/Entities.html b/OpenFlow/src/public/Entities.html
index ae15ccba..90428cbf 100644
--- a/OpenFlow/src/public/Entities.html
+++ b/OpenFlow/src/public/Entities.html
@@ -15,6 +15,10 @@
   </div>
   <div class=" col-md-6 text-right" id="entitiestools">
     <em class="fas fa-cog fa-spin" ng-show="ctrl.loading==true" title="Hang on, loading data"></em>
+    <input type="checkbox" id="checkbox-1" ng-model="ctrl.skipcustomerfilter" ng-change="ctrl.Search()"
+    ng-show="menuctrl.WebSocketClientService.multi_tenant">
+  <label for="checkbox-1" ng-show="menuctrl.WebSocketClientService.multi_tenant"><span translate lib="web">show
+      all</span></label>
     <!-- <em class="fas fa-cog" ng-show="ctrl.loading!=true" title="I spin, while loading data"></em> -->
     <span ng-show="ctrl.collection == 'openrpa_instances'">
       <input type="checkbox" id="checkbox-1" ng-model="ctrl.showrunning" ng-change="ctrl.loadData()">
@@ -71,7 +75,9 @@
           title="Edit this item"><em
             class="fas fa-edit"></em></a>
         <em class="fas fa-edit btn disabled" ng-show="ctrl.loading == true"></em>
-        <a href ng-click="ctrl.DeleteOne(model)" ng-disabled="ctrl.loading==true" class="btn" title="Delete this item"><em
+        <a href ng-click="ctrl.DeleteOne(model)" ng-disabled="ctrl.loading==true" class="btn" title="Delete this item"
+        ng-class="{'btn-danger': ctrl.shiftdown==true && ctrl.collection == 'users' && (model._type == 'user' || model._type == 'customer')}"
+        ><em
             class="fas fa-trash"></em></a>
       </td>
     </tr>
diff --git a/OpenFlow/src/public/FormResource.html b/OpenFlow/src/public/FormResource.html
new file mode 100644
index 00000000..f60e215e
--- /dev/null
+++ b/OpenFlow/src/public/FormResource.html
@@ -0,0 +1,39 @@
+<div class="row">
+    <div class="col-sm-20">
+        <h1 class="pagetitle" translate lib="web">formresource</h1>
+    </div>
+</div>
+
+<pre ng-show="ErrorMessage!=null">{{ ErrorMessage }}</pre>
+<div ng-show="ctrl.errormessage != ''"" class=" alert alert-danger" role="alert">{{ctrl.errormessage}}</div>
+<form ng-submit="ctrl.submit()" class="form-horizontal" role="form" autocomplete="off">
+
+    <div class="form-group">
+        <label for="provider" class="col-sm-2 control-label" translate lib="web">collection</label>
+        <div class="col-sm-4">
+            <select id="menucollections" ng-model="ctrl.model.collection"
+            ng-options="item.name as item.name for item in ctrl.collections">
+          </select>
+        </div>
+    </div>
+    <div class="form-group">
+        <label for="name" class="col-sm-2 control-label" translate lib="web">name</label>
+        <div class="col-sm-4">
+            <input ng-model="ctrl.model.name" class="form-control input-md" ng-disabled="ctrl.loading==true" />
+        </div>
+    </div>
+    <div class="form-group">
+        <label for="id" class="col-sm-2 control-label" translate lib="web">aggregates</label>
+        <div class="col-sm-4">
+            <textarea json-text class='form-control' rows='1' data-min-rows='1' ng-model="ctrl.model.aggregates"
+            ng-disabled="ctrl.loading==true"></textarea>
+        </div>
+    </div>
+    <div class="form-group">
+        <div class="col-sm-offset-2 col-sm-10">
+            <button type="submit" ng-disabled="ctrl.loading==true" class="btn btn-success" translate
+                lib="web">Save</button>
+        </div>
+    </div>
+
+</form>
\ No newline at end of file
diff --git a/OpenFlow/src/public/FormResources.html b/OpenFlow/src/public/FormResources.html
new file mode 100644
index 00000000..dd32dec0
--- /dev/null
+++ b/OpenFlow/src/public/FormResources.html
@@ -0,0 +1,40 @@
+<div class="row">
+  <h1 translate lib="web">formresources</h1>
+</div>
+<div class="col-sm-12 text-right">
+  <em class="fas fa-cog fa-spin" ng-show="ctrl.loading==true"></em>
+  <a ng-href="#/FormResource" class="btn btn-info" translate lib="web">addresource</a>
+</div>
+<div ng-show="ctrl.errormessage != ''" class=" alert alert-danger" role="alert">{{ctrl.errormessage}}</div>
+<table id="table1" class="table table-striped" when-scrolled="ctrl.more()" style="width: 100%;">
+  <!-- <caption>List of workflow forms</caption> -->
+  <thead class="thead-dark">
+    <tr>
+      <th ng-click="ctrl.ToggleOrder('name')" scope="col"><strong translate lib="web">name</strong></th>
+      <th class="w-150" ng-click="ctrl.ToggleOrder('_createdby')" scope="col"><strong translate
+          lib="web">createdby</strong></th>
+      <th class="w-150" ng-click="ctrl.ToggleOrder('_created')" scope="col"><strong translate lib="web">created</strong>
+      </th>
+      <th class="w-150" ng-click="ctrl.ToggleOrder('_modified')" scope="col"><strong translate
+          lib="web">updated</strong></th>
+      <th class="w-150" scope="col"></th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr ng-repeat="model in ctrl.models">
+      <td><a style="color: inherit; text-decoration: inherit;" ng-href="#/FormResource/{{model._id}}">{{model.name}}</a></td>
+      <td>{{model._createdby}}</td>
+      <td>
+        <timesince ng-model="model._created" />
+      </td>
+      <td>
+        <timesince ng-model="model._modified" />
+      </td>
+      <td>
+        <a class="btn" ng-href="#/FormResource/{{model._id}}"><em class="fas fa-edit"></em></a>
+        <a class="btn" href ng-click="ctrl.DeleteOne(model)" ng-disabled="ctrl.loading==true"><em
+            class="fas fa-trash"></em></a>
+      </td>
+    </tr>
+  </tbody>
+</table>
\ No newline at end of file
diff --git a/OpenFlow/src/public/Forms.html b/OpenFlow/src/public/Forms.html
index 3417ad18..4509aa3f 100644
--- a/OpenFlow/src/public/Forms.html
+++ b/OpenFlow/src/public/Forms.html
@@ -7,7 +7,7 @@ <h1 translate lib="web">forms</h1>
 </div>
 <div ng-show="ctrl.errormessage != ''" class=" alert alert-danger" role="alert">{{ctrl.errormessage}}</div>
 <table id="table1" class="table table-striped" when-scrolled="ctrl.more()" style="width: 100%;">
-  <caption>List of workflow forms</caption>
+  <!-- <caption>List of workflow forms</caption> -->
   <thead class="thead-dark">
     <tr>
       <th ng-click="ctrl.ToggleOrder('name')" scope="col"><strong translate lib="web">name</strong></th>
diff --git a/OpenFlow/src/public/Login.html b/OpenFlow/src/public/Login.html
index fbdba192..e478da65 100644
--- a/OpenFlow/src/public/Login.html
+++ b/OpenFlow/src/public/Login.html
@@ -11,23 +11,25 @@ <h5 class="card-title text-center"><span translate lib="web">signin</span> {{ctr
           <form class="form-signin" ngNoForm method='post' action='/local'>
             <div class="form-label-group" ng-show="ctrl.localenabled">
               <input type="text" name="username" ng-model="ctrl.username" class="form-control" placeholder="email"
-                required autofocus autocomplete='off'>
+                required autofocus autocomplete='off' ng-change="ctrl.usernameblur()" ng-blur="ctrl.usernameblur()">
               <label for="username" translate lib="web">email</label>
             </div>
-            <div class="form-label-group" ng-show="ctrl.localenabled">
+            <div class="form-label-group" ng-show="ctrl.localenabled" id="password">
               <input type="password" name="password" ng-model="ctrl.password" class="form-control"
                 placeholder="Password" required>
               <label for="password" translate lib="web">password</label>
             </div>
             <div class="mb-3">
-              <label class="text-danger" translate lib="web" ng-model="ctrl.message"></label>
+              <label class="text-danger" translate lib="web" ng-model="ctrl.message">{{ctrl.message}}</label>
             </div>
-            <button class="btn btn-lg btn-primary btn-block text-uppercase" type="submit" ng-show="ctrl.localenabled"
+            <div id="localbuttons">
+              <button class="btn btn-lg btn-primary btn-block text-uppercase" type="submit" ng-show="ctrl.localenabled"
               translate lib="web" ng-click="ctrl.loading = true">signin</button>
               <hr class="my-4"  ng-show="ctrl.localenabled && ctrl.forgot_pass_emails">
               <button class="btn btn-lg btn-primary btn-block text-uppercase" type="button" ng-show="ctrl.localenabled && ctrl.forgot_pass_emails"
               ng-click="ctrl.BeginForgotPassword()" 
               translate lib="web" ng-click="ctrl.loading = true">forgot password</button>
+            </div>
             <hr class="my-4" ng-show="ctrl.localenabled">
 
             <a ng-href="/{{model.id}}" ng-repeat="model in ctrl.providers" class="btn btn-lg btn-block text-uppercase"
diff --git a/OpenFlow/src/public/MailHist.html b/OpenFlow/src/public/MailHist.html
index 1b85b2c0..d11085a3 100644
--- a/OpenFlow/src/public/MailHist.html
+++ b/OpenFlow/src/public/MailHist.html
@@ -1,6 +1,6 @@
 <div class="row">
     <div class="col-sm-20">
-        <h1 class="pagetitle" translate lib="web">role</h1>
+        <h1 class="pagetitle" translate lib="web">emailhistdetails</h1>
     </div>
 </div>
 <style type="text/css">
diff --git a/OpenFlow/src/public/PassiveLogin.html b/OpenFlow/src/public/PassiveLogin.html
index a5e21b70..576678d9 100644
--- a/OpenFlow/src/public/PassiveLogin.html
+++ b/OpenFlow/src/public/PassiveLogin.html
@@ -209,6 +209,7 @@
       this.validate_user_form = data.validate_user_form
       this.validate_emails = data.validate_emails
       this.forgot_pass_emails = data.forgot_pass_emails;
+      this.forceddomains = data.forceddomains;
       console.log("data", data)
       console.log("validate_emails", this.validate_emails);
       console.log("forgot_pass_emails", this.forgot_pass_emails);
@@ -340,6 +341,31 @@
           document.location.href="/login";
         });
     }
+    this.usernameblur = function () {
+      var ele = document.getElementById('username');
+      var val = ele.value;
+      console.log("val", val);
+      if(val && val.indexOf("@") > -1) {
+        var domain = val.substr(val.indexOf("@") + 1);
+        console.log("domain", domain);
+        for (let d = 0; d < this.forceddomains.length; d++) {
+          let forceddomain = new RegExp(this.forceddomains[d], "i");
+          if(forceddomain.test(domain)) {
+            console.log("domain found in forceddomains");
+            document.getElementById("password").style.display = "none";
+            document.getElementById("localbuttons").style.display = "none";
+            this.errormessage = "Please use provider button to login with this domain";
+            if (!$scope.$$phase) { $scope.$apply(); }
+            return;
+          }
+        }
+      }
+      console.log("domain is not forced");
+      this.errormessage = "";
+      if (!$scope.$$phase) { $scope.$apply(); }
+      document.getElementById("password").style.display = "block";
+      document.getElementById("localbuttons").style.display = "block";
+    }
   }
   angular.module('controllerExample', [])
     .controller('SettingsController2', SettingsController2);
@@ -360,10 +386,10 @@ <h5 class="card-title text-center"><span translate lib="web">signin</span> {{ctr
             <form class="form-signin" ngNoForm method='post' action='/local' ng-show="ctrl.stage == 0">
               <div class="form-label-group" ng-show="ctrl.localenabled">
                 <input type="text" name="username" id="username" ng-model="ctrl.username" class="form-control" placeholder="email"
-                  required autofocus autocomplete='off'>
+                  required autofocus autocomplete='off' ng-change="ctrl.usernameblur()" ng-blur="ctrl.usernameblur()">
                 <label for="username" translate lib="web">email</label>
               </div>
-              <div class="form-label-group" ng-show="ctrl.localenabled">
+              <div class="form-label-group" ng-show="ctrl.localenabled" id="password">
                 <input type="password" name="password" ng-model="ctrl.password" class="form-control"
                   placeholder="Password" required autocomplete="current-password">
                 <label for="password" translate lib="web">password</label>
@@ -372,12 +398,13 @@ <h5 class="card-title text-center"><span translate lib="web">signin</span> {{ctr
 
                 <label class="text-danger">{{ctrl.message}}</label>
               </div>
+              <div id="localbuttons">
               <button class="btn btn-lg btn-primary btn-block text-uppercase" type="submit" ng-show="ctrl.localenabled"
                 translate lib="web">signin</button>
                 <hr class="my-4" ng-show="ctrl.localenabled && ctrl.forgot_pass_emails">
                 <button class="btn btn-lg btn-primary btn-block text-uppercase" type="button" ng-click="ctrl.BeginForgotPassword()" ng-show="ctrl.localenabled && ctrl.forgot_pass_emails"
                 translate lib="web">forgot password</button>
-
+              </div>
                 
               <hr class="my-4" ng-show="ctrl.localenabled">
 
diff --git a/OpenFlow/src/public/Provider.html b/OpenFlow/src/public/Provider.html
index 4f9cd4d1..1ab5159b 100644
--- a/OpenFlow/src/public/Provider.html
+++ b/OpenFlow/src/public/Provider.html
@@ -14,6 +14,7 @@ <h1 class="pagetitle" translate lib="web">provider</h1>
             <select class="form-control" ng-model="ctrl.model.provider">
                 <option value="saml">WS-Federation/SAML</option>
                 <option value="google">Google OAuth</option>
+                <option value="oidc">OpenID Connect</option>
                 <option value="local">Username/Password</option>
             </select>
         </div>
@@ -36,26 +37,52 @@ <h1 class="pagetitle" translate lib="web">provider</h1>
             <input ng-model="ctrl.model.issuer" class="form-control input-md" ng-disabled="ctrl.loading==true" />
         </div>
     </div>
-    <div class="form-group" ng-show="ctrl.model.provider=='saml'">
+    <div class="form-group" ng-show="ctrl.model.provider=='saml' || ctrl.model.provider=='oidc'">
         <label for="saml_federation_metadata" class="col-sm-2 control-label" translate lib="web">metadataurl</label>
         <div class="col-sm-4">
             <input ng-model="ctrl.model.saml_federation_metadata" class="form-control input-md"
                 ng-disabled="ctrl.loading==true" />
         </div>
     </div>
-    <div class="form-group" ng-show="ctrl.model.provider=='google'">
+    <div class="form-group" ng-show="ctrl.model.provider=='google' || ctrl.model.provider=='oidc'">
         <label for="consumerKey" class="col-sm-2 control-label" translate lib="web">consumerkey</label>
         <div class="col-sm-4">
             <input ng-model="ctrl.model.consumerKey" class="form-control input-md" ng-disabled="ctrl.loading==true" />
         </div>
     </div>
-    <div class="form-group" ng-show="ctrl.model.provider=='google'">
+    <div class="form-group" ng-show="ctrl.model.provider=='google' || ctrl.model.provider=='oidc'">
         <label for="consumerSecret" class="col-sm-2 control-label" translate lib="web">consumersecret</label>
         <div class="col-sm-4">
             <input ng-model="ctrl.model.consumerSecret" class="form-control input-md"
                 ng-disabled="ctrl.loading==true" />
         </div>
     </div>
+    
+    <div class="form-group">
+        <label class="col-sm-2 control-label" translate lib="web">forceddomains</label>
+        <div class="col-sm-4">
+        </div>
+    </div>
+    <div class="form-group" ng-repeat="id in ctrl.model.forceddomains">
+        <label class="col-sm-2 control-label" translate lib="web"></label>
+        <div class="col-sm-4">
+            {{ id }}
+            <button type="button" ng-disabled="ctrl.loading==true" class="btn btn-danger" ng-click="ctrl.deleteforceddomains(id)"
+                translate lib="web">delete</button>
+        </div>
+    </div>
+
+    <div class="form-inline">
+        <div class="form-group mb-2">
+            <label class="sr-only" translate lib="web">addforceddomains</label>
+        </div>
+        <div class="form-group mx-sm-3 mb-2">
+            <input ng-model="ctrl.newforceddomain" type="text" class="form-control" placeholder="New forced domain"
+                autocomplete="new-password">
+        </div>
+        <button type="button" class="btn btn-success mb-2" ng-disabled="ctrl.loading==true" ng-click="ctrl.addforceddomains()">add domain</button>
+    </div>
+
     <div class="form-group" ng-show="ctrl.model.provider=='saml'">
         <label for="saml_federation_metadata" class="col-sm-2 control-label" translate lib="web">embedsignout</label>
         <div class="col-sm-4">
diff --git a/OpenFlow/src/public/Queue.html b/OpenFlow/src/public/Queue.html
deleted file mode 100644
index 4c458650..00000000
--- a/OpenFlow/src/public/Queue.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<a ng-disabled="ctrl.loading==true" type="button" class="btn btn-success" ng-href="#/Queues">Queues</a>
-<a ng-disabled="ctrl.loading==true" type="button" class="btn btn-success" ng-href="#/Sockets">Sockets</a>
-<div class="row">
-  <h1 translate lib="web">{{ctrl.model.name}}</h1>
-</div>
-<div ng-show="ctrl.errormessage != ''"" class=" alert alert-danger" role="alert">{{ctrl.errormessage}}</div>
-
-<table id=" table1" class="table table-striped table-hover table-sm" when-scrolled="ctrl.more()" style="width: 100%;">
-  <thead class="thead-dark">
-    <tr>
-      <th scope="col"><b translate lib="web">ack</b></th>
-      <th scope="col"><b translate lib="web">active</b></th>
-      <th scope="col"><b translate lib="web">consumer_tag</b></th>
-      <th scope="col"><b translate lib="web">clientname</b></th>
-      <th scope="col"><b translate lib="web">remoteip</b></th>
-      <th scope="col"><b translate lib="web"></b></th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr ng-repeat="model in ctrl.data.consumer_details">
-      <td>{{model.ack_required}}</td>
-      <td>{{model.active}}</td>
-      <td>{{model.consumer_tag}}</td>
-      <td>{{model.clientname}}</td>
-      <td>{{model.remoteip}}</td>
-      <td class="btn-cell">
-        <a href ng-click="ctrl.DeleteQueue(model)" ng-disabled="ctrl.loading==true"><em class="fas fa-trash"></em></a>
-      </td>
-    </tr>
-  </tbody>
-</table>
\ No newline at end of file
diff --git a/OpenFlow/src/public/Queues.html b/OpenFlow/src/public/Queues.html
deleted file mode 100644
index 6b1be5f3..00000000
--- a/OpenFlow/src/public/Queues.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<a ng-disabled="ctrl.loading==true" type="button" class="btn btn-success" ng-href="#/Sockets">Sockets</a>
-<button ng-click="ctrl.DumpRabbitmq()" ng-disabled="ctrl.loading==true" type="button" class="btn btn-success ">Dump
-  Rabbitmq</button>
-<button ng-click="ctrl.loadData()" ng-disabled="ctrl.loading==true" type="button"
-  class="btn btn-success ">Reload</button>
-
-<table id=" table1" class="table table-striped table-hover table-sm" when-scrolled="ctrl.more()" style="width: 100%;">
-  <caption></caption>
-  <thead class="thead-dark">
-    <tr>
-      <th scope="col" ng-click="ctrl.ToggleOrder('name')"><strong translate lib="web">name</strong></th>
-      <th scope="col" ng-click="ctrl.ToggleOrder('_type')"><strong translate lib="web">type</strong></th>
-      <th scope="col" ng-click="ctrl.ToggleOrder('consumers')"><strong translate lib="web">consumers</strong></th>
-      <th scope="col" ng-click="ctrl.ToggleOrder('queuename')"><strong translate lib="web">queuename</strong></th>
-      <th scope="col" ng-click="ctrl.ToggleOrder('_modified')"><strong translate lib="web">updated</strong></th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr ng-repeat="model in ctrl.models">
-      <td><a style="color: inherit; text-decoration: inherit;" ng-href="#/Queue/{{model._id}}">{{model.name}}</a></td>
-      <td><span translate lib="web">{{model.type || model._type}}</span></td>
-      <td>{{model.consumers}}</td>
-      <td>{{model.queuename}}</td>
-      <td>
-        <timesince ng-model="model._modified" />
-      </td>
-    </tr>
-  </tbody>
-</table>
\ No newline at end of file
diff --git a/OpenFlow/src/public/Signup.html b/OpenFlow/src/public/Signup.html
deleted file mode 100644
index 7f22e8b3..00000000
--- a/OpenFlow/src/public/Signup.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<section>
-    signup
-</section>
\ No newline at end of file
diff --git a/OpenFlow/src/public/Socket.html b/OpenFlow/src/public/Socket.html
deleted file mode 100644
index d9283410..00000000
--- a/OpenFlow/src/public/Socket.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<div class="starter-template">
-  <h1 translate lib="web">sockets</h1>
-</div>
-
-<div ng-show="ctrl.errormessage != ''"" class=" alert alert-danger" role="alert">{{ctrl.errormessage}}</div>
-<form ng-submit="ctrl.submit()" class="form-horizontal" role="form" autocomplete="off" ng-hide="ctrl.showjson==true">
-  <section>
-    <div class="form-group">
-      <label class="col-sm-3 control-label">queuename:</label>
-      <div class="col-sm-9">
-        <input ng-model="ctrl.queuename" class="form-control input-md" ng-disabled="ctrl.loading==true" />
-      </div>
-    </div>
-  </section>
-  <section>
-    <div class="form-group">
-      <label class="col-sm-3 control-label">message:</label>
-      <div class="col-sm-9">
-        <input ng-model="ctrl.message" class="form-control input-md" ng-disabled="ctrl.loading==true" />
-      </div>
-    </div>
-  </section>
-  <section>
-    <div class="form-group">
-      <div class="col-sm-offset-2 col-sm-10">
-        <button type="submit" ng-disabled="ctrl.loading==true" class="btn btn-secondary" translate
-          lib="web">save</button>
-      </div>
-    </div>
-  </section>
-  <section>
-    <div class="form-group">
-      <div class="col-sm-offset-2 col-sm-10">
-        <button type="button" class="btn btn-secondary" ng-click="ctrl.EnsureNoderedInstance()">Ensure</button>
-        <button type="button" class="btn btn-secondary" ng-click="ctrl.RestartNoderedInstance()">Restart</button>
-        <button type="button" class="btn btn-secondary" ng-click="ctrl.DeleteNoderedInstance()">Delete</button>
-      </div>
-    </div>
-  </section>
-</form>
-
-<pre>{{ ctrl.messages }}</pre>
\ No newline at end of file
diff --git a/OpenFlow/src/public/Sockets.html b/OpenFlow/src/public/Sockets.html
deleted file mode 100644
index 5526094e..00000000
--- a/OpenFlow/src/public/Sockets.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<a ng-disabled="ctrl.loading==true" type="button" class="btn btn-success" ng-href="#/Queues">Queues</a>
-<button ng-click="ctrl.DumpClients()" ng-disabled="ctrl.loading==true" type="button" class="btn btn-success ">Dump
-  Clients</button>
-<button ng-click="ctrl.loadData()" ng-disabled="ctrl.loading==true" type="button"
-  class="btn btn-success ">Reload</button>
-
-<table id=" table1" class="table table-striped table-hover table-sm" when-scrolled="ctrl.more()" style="width: 100%;">
-  <caption></caption>
-  <thead class="thead-dark">
-    <tr>
-      <th scope="col" ng-click="ctrl.ToggleOrder('name')"><strong translate lib="web">name</strong></th>
-      <th scope="col" ng-click="ctrl.ToggleOrder('clientagent')"><strong translate lib="web">clientagent</strong></th>
-      <th scope="col" ng-click="ctrl.ToggleOrder('queues')"><strong translate lib="web">queues</strong></th>
-      <th scope="col" ng-click="ctrl.ToggleOrder('remoteip')"><strong translate lib="web">remoteip</strong></th>
-      <th scope="col" ng-click="ctrl.ToggleOrder('lastheartbeat')"><strong translate lib="web">lastheartbeat</strong>
-      </th>
-      <th scope="col" ng-click="ctrl.ToggleOrder('_modified')"><strong translate lib="web">updated</strong></th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr ng-repeat="model in ctrl.models">
-      <td>{{model.name}}</td>
-      <td>{{model.clientagent}}</td>
-      <td>{{model.queuescount}} </td>
-      <td>{{model.remoteip}} </td>
-      <td>
-        <timesince ng-model="model.lastheartbeat" />
-      </td>
-      <td>
-        <timesince ng-model="model._modified" />
-      </td>
-    </tr>
-    <tr>
-    </tr>
-  </tbody>
-</table>
\ No newline at end of file
diff --git a/OpenFlow/src/public/User.html b/OpenFlow/src/public/User.html
index b77518eb..431eea4f 100644
--- a/OpenFlow/src/public/User.html
+++ b/OpenFlow/src/public/User.html
@@ -28,19 +28,50 @@ <h1 class="pagetitle" translate lib="web">userdetails</h1>
                 ng-disabled="ctrl.loading==true" />
         </div>
     </div>
+    <div class="form-group" ng-show="menuctrl.hasrole('admins') && ctrl.model.email">
+        <label for="email" class="col-sm-2 control-label" translate lib="web">email</label>
+        <div class="col-sm-4">
+            <input ng-model="ctrl.model.email" class="form-control input-md"
+                ng-disabled="ctrl.loading==true" />
+        </div>
+    </div>
+    <div class="form-group" ng-show="menuctrl.hasrole('admins') && ctrl.model.company != '' && ctrl.model.company != null && ctrl.model.company != undefined">
+        <label for="company" class="col-sm-2 control-label" translate lib="web">company</label>
+        <div class="col-sm-4">
+            <input ng-model="ctrl.model.company" class="form-control input-md"
+                ng-disabled="ctrl.loading==true" />
+        </div>
+    </div>
+    <div class="form-group" ng-show="menuctrl.hasrole('admins') && (ctrl.model.dblocked == true || ctrl.model.dblocked == false)">
+        <label for="dblocked" class="col-sm-2 control-label" translate lib="web">dblocked</label>
+        <div class="col-sm-4">
+            <input type="checkbox" ng-model="ctrl.model.dblocked" class="input-md" ng-disabled="ctrl.loading==true" />
+        </div>
+    </div>
+    <div class="form-group" ng-show="menuctrl.hasrole('admins') && (ctrl.model.validated == true || ctrl.model.validated == false)">
+        <label for="validated" class="col-sm-2 control-label" translate lib="web">validated</label>
+        <div class="col-sm-4">
+            <input type="checkbox" ng-model="ctrl.model.validated" class="input-md" ng-disabled="ctrl.loading==true" />
+        </div>
+    </div>
+    <div class="form-group" ng-show="menuctrl.hasrole('admins') && (ctrl.model.validated == true || ctrl.model.validated == false)">
+        <label for="emailvalidated" class="col-sm-2 control-label" translate lib="web">emailvalidated</label>
+        <div class="col-sm-4">
+            <input type="checkbox" ng-model="ctrl.model.emailvalidated" class="input-md" ng-disabled="ctrl.loading==true" />
+        </div>
+    </div>
+    <div class="form-group" ng-show="menuctrl.hasrole('admins') && (ctrl.model.validated == true || ctrl.model.validated == false)">
+        <label for="formvalidated" class="col-sm-2 control-label" translate lib="web">formvalidated</label>
+        <div class="col-sm-4">
+            <input type="checkbox" ng-model="ctrl.model.formvalidated" class="input-md" ng-disabled="ctrl.loading==true" />
+        </div>
+    </div>
     <div class="form-group">
         <label for="name" class="col-sm-2 control-label" translate lib="web">disabled</label>
         <div class="col-sm-6">
             <input type="checkbox" ng-model="ctrl.model.disabled" class="input-md" ng-disabled="ctrl.loading==true" />
         </div>
     </div>
-    <div class="form-group" ng-show="ctrl.model.company != '' && ctrl.model.company != null && ctrl.model.company != undefined">
-        <label for="sid" class="col-sm-2 control-label" translate lib="web">company</label>
-        <div class="col-sm-4">
-            <input ng-model="ctrl.model.company" class="form-control input-md" ng-disabled="ctrl.loading==true || (!menuctrl.hasrole('admins') && !menuctrl.hasrole('customer admins') && !menuctrl.hasrole('resellers'))"
-             />
-        </div>
-    </div>
     <div class="form-group" ng-show="ctrl.model.sid != '' && ctrl.model.sid != null && ctrl.model.sid != undefined">
         <label for="sid" class="col-sm-2 control-label" translate lib="web">SID</label>
         <div class="col-sm-4">
diff --git a/OpenFlow/src/public/Users.html b/OpenFlow/src/public/Users.html
index 96276838..10096e94 100644
--- a/OpenFlow/src/public/Users.html
+++ b/OpenFlow/src/public/Users.html
@@ -1,3 +1,21 @@
+<style type="text/css">
+  .nonmultitenant {
+    /* width: 130px; */
+    white-space:nowrap
+  }
+  .multitenant {
+    /* width: 245px; */
+    white-space:nowrap
+  }
+  .validated {
+    /* width: 20px; */
+    white-space:nowrap
+  }
+  .dbusage {
+    /* width: 80px; */
+    white-space:nowrap
+  }
+</style>
 <div id="title" class="row">
   <h1 translate lib="web">users</h1>
 </div>
@@ -18,11 +36,8 @@ <h1 translate lib="web">users</h1>
       <th ng-click="ctrl.ToggleOrder('username')"><b translate lib="web">username</b></th>
       <th ng-click="ctrl.ToggleOrder('_created')"><b translate lib="web">created</b></th>
       <th ng-click="ctrl.ToggleOrder('lastseen')"><b translate lib="web">lastseen</b></th>
-      <th ng-click="ctrl.ToggleOrder('dbusage')"><b translate lib="web">dbusage</b></th>
-      <th ng-show="menuctrl.WebSocketClientService.multi_tenant" ng-click="ctrl.ToggleOrder('customerid')">
-        <i class="fas fa-money-bill-wave"></i>
-      </th>
-      <th ng-show="ctrl.WebSocketClientService.validate_user_form != ''" ng-click="ctrl.ToggleOrder('validated')">
+      <th ng-click="ctrl.ToggleOrder('dbusage')" class="dbusage"><b translate lib="web">dbusage</b></th>
+      <th ng-show="ctrl.WebSocketClientService.validate_user_form != ''" ng-click="ctrl.ToggleOrder('validated')" class="validated">
         <em class="fas fa-check"></em>
       </th>
       <th class="text-right"></th>
@@ -38,23 +53,26 @@ <h1 translate lib="web">users</h1>
       <td>
         <timesince ng-model="model.lastseen" />
       </td>
-      <td>
-        <div class="w-100">
+      <td class="dbusage">
+        <div >
           <format-bytes ng-model="model.dbusage" />
         </div>
-
       </td>
-      <td ng-show="menuctrl.WebSocketClientService.multi_tenant">
-        <a href ng-click="ctrl.ShowPlans(model)" class="btn" role="button" ng-show="menuctrl.user.customerid != null && menuctrl.WebSocketClientService.multi_tenant && model.customerid && model.customerid != '' &&
+      <td ng-show="ctrl.WebSocketClientService.validate_user_form != ''" class="validated">
+        <em ng-show="model.validated" class="fas fa-check"></em>
+      </td>
+      <td
+      ng-class="{multitenant: menuctrl.WebSocketClientService.multi_tenant == true, nonmultitenant: menuctrl.WebSocketClientService.multi_tenant == false}"
+  >
+        <div 
+        class="text-right"
+          >
+          <a href ng-click="ctrl.ShowPlans(model)" class="btn" role="button" ng-show="menuctrl.user.customerid != null && menuctrl.WebSocketClientService.multi_tenant && model.customerid && model.customerid != '' &&
           (menuctrl.hasrole('admins') || menuctrl.hasrole('customer admins') || menuctrl.hasrole('resellers'))          
           ">
           <em class="fas fa-money-bill-wave"></em></a>
-      </td>
-      <td ng-show="ctrl.WebSocketClientService.validate_user_form != ''">
-        <em ng-show="model.validated" class="fas fa-check"></em>
-      </td>
-      <td>
-        <div class="w-200 text-right">
+          <a ng-href="#/Customer/{{model.customerid}}" class="btn" role="button" ng-show="menuctrl.user.customerid != null && menuctrl.WebSocketClientService.multi_tenant && model.customerid && model.customerid != ''">
+          <em class="fas fa-industry"></em></a>
           <a ng-href ng-click="ctrl.Impersonate(model)" class="btn"
             ng-show="model._id != ctrl.WebSocketClientService.user._id"><em class="fas fa-user-secret"></em></a>
           <em class="btn fas fa-user-secret disabled" ng-show="model._id == ctrl.WebSocketClientService.user._id"></em>
@@ -62,7 +80,8 @@ <h1 translate lib="web">users</h1>
           <a class="btn" ng-href="#/User/{{model._id}}">
             <em class="fas fa-edit"></em>
           </a>
-          <a href ng-click="ctrl.DeleteOneUser(model)" class="btn" ng-disabled="ctrl.loading==true"><em
+          <a href ng-click="ctrl.DeleteOne(model)" class="btn" ng-disabled="ctrl.loading==true"
+          ng-class="{'btn-danger': ctrl.shiftdown==true && ctrl.collection == 'users' && (model._type == 'user' || model._type == 'customer')}"><em
               class="fas fa-trash"></em></a>
         </div>
       </td>
diff --git a/OpenFlow/src/public/WebSocketClientService.ts b/OpenFlow/src/public/WebSocketClientService.ts
index d14b31d7..c7320e5e 100644
--- a/OpenFlow/src/public/WebSocketClientService.ts
+++ b/OpenFlow/src/public/WebSocketClientService.ts
@@ -22,6 +22,7 @@ export class WebSocketClientService {
             }
             try {
                 const wsurl: string = data.wsurl;
+                this.wsurl = data.wsurl;
                 this.version = data.version;
                 this.domain = data.domain;
                 this.version = data.version;
@@ -41,6 +42,9 @@ export class WebSocketClientService {
                 this.nodered_images = data.nodered_images;
                 this.enable_entity_restriction = data.enable_entity_restriction;
                 this.enable_web_tours = data.enable_web_tours;
+                this.enable_nodered_tours = data.enable_nodered_tours;
+
+                this.forceddomains = data.forceddomains;
 
                 if (data.collections_with_text_index) this.collections_with_text_index = data.collections_with_text_index;
                 if (data.timeseries_collections) this.timeseries_collections = data.timeseries_collections;
@@ -169,6 +173,7 @@ export class WebSocketClientService {
     // public user: TokenUser = null;
     // public jwt: string = null;
     public version: string = "";
+    public wsurl: string = "";
     public messageQueue: IHashTable<QueuedMessage> = {};
     public usingCordova: boolean = false;
     public connected: boolean = false;
@@ -187,6 +192,8 @@ export class WebSocketClientService {
     public multi_tenant: boolean;
     public enable_entity_restriction: boolean;
     public enable_web_tours: boolean;
+    public enable_nodered_tours: boolean;
+    public forceddomains: string[] = [];
     public collections_with_text_index: string[] = [];
     public timeseries_collections: string[] = [];
     public ping_clients_interval: number = 10000;
diff --git a/OpenFlow/src/public/app.css b/OpenFlow/src/public/app.css
index 16171683..092e680b 100644
--- a/OpenFlow/src/public/app.css
+++ b/OpenFlow/src/public/app.css
@@ -444,14 +444,14 @@ textarea{
 }
 
 .dark-mode .shepherd-element .shepherd-content header .shepherd-title {
-  color: rgba(255, 255, 255, 0.75);
+  color: hsla(0deg, 0%, 100%, 0.75);
   display: flex;
   flex: 1 0 auto;
   font-size: 1.1em;
 }
 
 .dark-mode .shepherd-element .shepherd-content header .shepherd-cancel-link {
-  color: rgba(255, 255, 255, 0.75);
+  color: hsla(0deg, 0%, 100%, 0.75);
   font-size: 2em;
   margin-left: auto;
   text-decoration: none;
@@ -463,18 +463,18 @@ textarea{
 }
 
 .dark-mode .shepherd-element .shepherd-content header .shepherd-cancel-link:hover {
-  color: rgba(255, 255, 255, 0.75);
+  color: hsla(0deg, 0%, 100%, 0.75);
 }
 
 .dark-mode .shepherd-element .shepherd-content .shepherd-text {
-  color: rgba(255, 255, 255, 0.75);
+  color: hsla(0deg, 0%, 100%, 0.75);
   line-height: 1.3em;
   padding: 0.75em;
 }
 
 .dark-mode .shepherd-element .shepherd-content .shepherd-text a, .shepherd-element .shepherd-content .shepherd-text a:active, .shepherd-element .shepherd-content .shepherd-text a:visited {
-  border-bottom: 1px dotted rgba(255, 255, 255, 0.75);
-  color: rgba(255, 255, 255, 0.75);
+  border-bottom: 1px dotted hsla(0deg, 0%, 100%, 0.75);
+  color: hsla(0deg, 0%, 100%, 0.75);
   text-decoration: none;
 }
 
@@ -521,7 +521,7 @@ textarea{
   background: #3288e6;
   border: 0;
   border-radius: 3px;
-  color: rgba(255, 255, 255, 0.75);
+  color: hsla(0deg, 0%, 100%, 0.75);
   cursor: pointer;
   font-family: inherit;
   font-size: 0.8em;
diff --git a/OpenFlow/src/public/app.ts b/OpenFlow/src/public/app.ts
index f287a5db..018c1146 100644
--- a/OpenFlow/src/public/app.ts
+++ b/OpenFlow/src/public/app.ts
@@ -3,9 +3,9 @@ import angular = require("angular");
 import { timesince, timetoo, translate, textarea, fileread, userdata, api, copytext, jsonText, formatBytes, whenScrolled, ngtype } from "./CommonControllers";
 import {
     MenuCtrl, ProvidersCtrl, MainCtrl, LoginCtrl, ProviderCtrl, UsersCtrl, UserCtrl, RolesCtrl, RoleCtrl, RPAWorkflowsCtrl, RPAWorkflowCtrl,
-    WorkflowsCtrl, ReportsCtrl, jslogCtrl, EditFormCtrl, FormsCtrl, FormCtrl, FilesCtrl, EntitiesCtrl, EntityCtrl, HistoryCtrl, SocketCtrl, NoderedCtrl,
-    hdrobotsCtrl, ClientsCtrl, AuditlogsCtrl, SignupCtrl, QueuesCtrl, SocketsCtrl, QueueCtrl, CredentialsCtrl, CredentialCtrl, DuplicatesCtrl,
-    OAuthClientsCtrl, OAuthClientCtrl, DeletedCtrl, CustomerCtrl, EntityRestrictionsCtrl, EntityRestrictionCtrl, CustomersCtrl, ResourcesCtrl, ResourceCtrl, WorkitemsCtrl, WorkitemCtrl, WorkitemQueuesCtrl, WorkitemQueueCtrl, MailHistCtrl, MailHistsCtrl
+    WorkflowsCtrl, ReportsCtrl, EditFormCtrl, FormsCtrl, FormCtrl, FilesCtrl, EntitiesCtrl, EntityCtrl, HistoryCtrl, NoderedCtrl,
+    hdrobotsCtrl, ClientsCtrl, AuditlogsCtrl, CredentialsCtrl, CredentialCtrl, DuplicatesCtrl,
+    OAuthClientsCtrl, OAuthClientCtrl, DeletedCtrl, CustomerCtrl, EntityRestrictionsCtrl, EntityRestrictionCtrl, CustomersCtrl, ResourcesCtrl, ResourceCtrl, WorkitemsCtrl, WorkitemCtrl, WorkitemQueuesCtrl, WorkitemQueueCtrl, MailHistCtrl, MailHistsCtrl, FormResourcesCtrl, FormResourceCtrl
 } from "./Controllers";
 
 require('angular-route');
@@ -81,13 +81,15 @@ module openflow {
 
                 .when('/Workflows', { templateUrl: 'Workflows.html', controller: WorkflowsCtrl, controllerAs: 'ctrl' })
                 .when('/Reports', { templateUrl: 'Reports.html', controller: ReportsCtrl, controllerAs: 'ctrl' })
-                .when('/jslog', { templateUrl: 'jslog.html', controller: jslogCtrl, controllerAs: 'ctrl' })
 
                 .when('/EditForm/:id', { templateUrl: 'EditForm.html', controller: EditFormCtrl, controllerAs: 'ctrl' })
                 .when('/EditForm', { templateUrl: 'EditForm.html', controller: EditFormCtrl, controllerAs: 'ctrl' })
                 .when('/Forms', { templateUrl: 'Forms.html', controller: FormsCtrl, controllerAs: 'ctrl' })
                 .when('/Form/:id', { templateUrl: 'Form.html', controller: FormCtrl, controllerAs: 'ctrl' })
                 .when('/Form/:id/:instance', { templateUrl: 'Form.html', controller: FormCtrl, controllerAs: 'ctrl' })
+                .when('/FormResources', { templateUrl: 'FormResources.html', controller: FormResourcesCtrl, controllerAs: 'ctrl' })
+                .when('/FormResource', { templateUrl: 'FormResource.html', controller: FormResourceCtrl, controllerAs: 'ctrl' })
+                .when('/FormResource/:id', { templateUrl: 'FormResource.html', controller: FormResourceCtrl, controllerAs: 'ctrl' })
 
                 .when('/Files', { templateUrl: 'Files.html', controller: FilesCtrl, controllerAs: 'ctrl' })
                 .when('/Entities', { templateUrl: 'Entities.html', controller: EntitiesCtrl, controllerAs: 'ctrl' })
@@ -100,7 +102,6 @@ module openflow {
                 .when('/History/:collection/:id', { templateUrl: 'History.html', controller: HistoryCtrl, controllerAs: 'ctrl' })
                 .when('/Deleted/:collection', { templateUrl: 'Deleted.html', controller: DeletedCtrl, controllerAs: 'ctrl' })
 
-                .when('/Socket', { templateUrl: 'Socket.html', controller: SocketCtrl, controllerAs: 'ctrl' })
                 .when('/Nodered', { templateUrl: 'Nodered.html', controller: NoderedCtrl, controllerAs: 'ctrl' })
                 .when('/Nodered/:id', { templateUrl: 'Nodered.html', controller: NoderedCtrl, controllerAs: 'ctrl' })
 
@@ -109,13 +110,6 @@ module openflow {
 
                 .when('/Auditlogs', { templateUrl: 'Auditlogs.html', controller: AuditlogsCtrl, controllerAs: 'ctrl' })
 
-                .when('/Signup', { templateUrl: 'Signup.html', controller: SignupCtrl, controllerAs: 'ctrl' })
-
-                .when('/Queue', { templateUrl: 'Queue.html', controller: QueueCtrl, controllerAs: 'ctrl' })
-                .when('/Queue/:id', { templateUrl: 'Queue.html', controller: QueueCtrl, controllerAs: 'ctrl' })
-                .when('/Queues', { templateUrl: 'Queues.html', controller: QueuesCtrl, controllerAs: 'ctrl' })
-                .when('/Sockets', { templateUrl: 'Sockets.html', controller: SocketsCtrl, controllerAs: 'ctrl' })
-
                 .when('/Credentials', { templateUrl: 'Credentials.html', controller: CredentialsCtrl, controllerAs: 'ctrl' })
                 .when('/Credential', { templateUrl: 'Credential.html', controller: CredentialCtrl, controllerAs: 'ctrl' })
                 .when('/Credential/:id', { templateUrl: 'Credential.html', controller: CredentialCtrl, controllerAs: 'ctrl' })
@@ -133,7 +127,6 @@ module openflow {
                 .when('/EntityRestriction', { templateUrl: 'EntityRestriction.html', controller: EntityRestrictionCtrl, controllerAs: 'ctrl' })
                 .when('/EntityRestriction/:id', { templateUrl: 'EntityRestriction.html', controller: EntityRestrictionCtrl, controllerAs: 'ctrl' })
 
-
                 .when('/Resources', { templateUrl: 'Resources.html', controller: ResourcesCtrl, controllerAs: 'ctrl' })
                 .when('/Resource', { templateUrl: 'Resource.html', controller: ResourceCtrl, controllerAs: 'ctrl' })
                 .when('/Resource/:id', { templateUrl: 'Resource.html', controller: ResourceCtrl, controllerAs: 'ctrl' })
diff --git a/OpenFlow/src/public/index.html b/OpenFlow/src/public/index.html
index f3c7a2d3..29296726 100644
--- a/OpenFlow/src/public/index.html
+++ b/OpenFlow/src/public/index.html
@@ -91,8 +91,12 @@ <h5 class="sidebar-title">Misc management</h5>
         ng-show="menuctrl.WebSocketClientService.enable_entity_restriction && menuctrl.hasrole('admins')"><span
           translate lib="web">entityrestrictions</span></a>
       <a class="sidebar-link" href="#/Forms" id="menuadminforms"
-        ng-class="{active: menuctrl.PathIs(['/Forms', '/EditForm', '/EditForm/'])}"><span translate
-          lib="web">forms</span></a>
+      ng-class="{active: menuctrl.PathIs(['/Forms', '/EditForm', '/EditForm/'])}"><span translate
+        lib="web">forms</span></a>
+      <a class="sidebar-link" href="#/FormResources" id="menuadminformresources"
+      ng-show="menuctrl.WebSocketClientService.validlicense"
+      ng-class="{active: menuctrl.PathIs(['/FormResources', '/FormResource', '/FormResource/'])}"><span translate
+        lib="web">formresources</span></a>
       <a class="sidebar-link" href="#/Providers"
         ng-class="{active: menuctrl.PathIs(['/Providers', '/Provider', '/Provider/'])}"
         ng-show="menuctrl.hasrole('admins')"><span translate lib="web">providers</span></a>
@@ -122,6 +126,7 @@ <h5 class="sidebar-title">Misc management</h5>
     <div class="sticky-alerts"></div>
 
     <nav class="navbar navbar-expand-md fixed-top" ng-show="menuctrl.signedin">
+      <button class="btn" type="button" ng-click="menuctrl.toggleSidebar()"><i class="fa fa-bars" aria-hidden="true"></i></button>
       <a href="#" class="navbar-brand">
         <span translate lib="web">sitename</span>
       </a>
@@ -182,9 +187,6 @@ <h5 class="sidebar-title">Misc management</h5>
         </div>
       </form>
 
-
-
-
       <div class="navbar-content d-md-none ml-auto">
         <div class="dropdown with-arrow">
           <button class="btn" data-toggle="dropdown" type="button" id="navbar-dropdown-toggle-btn-1">
@@ -213,6 +215,10 @@ <h5 class="sidebar-title">Misc management</h5>
 
     </nav>
     <div class="content-wrapper">
+      <div class="alert alert-danger" ng-show="menuctrl.user.dblocked">
+        You are currently using more than the 25mb allowed. 
+        Please <a href="#/Customer">buy more</a> storage or install <a href="https://openflow.openiap.io/">openflow</a> locally.
+      </div>
       <main role="main" class="container"
         ng-show="menuctrl.signedin || menuctrl.path=='/Login' || menuctrl.path=='/Signup'">
         <div ng-view class="starter-template">
diff --git a/OpenFlow/src/public/jslog.html b/OpenFlow/src/public/jslog.html
deleted file mode 100644
index 2331c73e..00000000
--- a/OpenFlow/src/public/jslog.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<div class="row">
-  <h1 translate lib="web">jslog</h1>
-  <p class="col-md-5 lead"></p>
-  <div class="form-group col-sm-3 form-horizontal">
-    <label class="sr-only">Filter</label>
-    <div class="input-group unframed-addons">
-      <div class="input-group-addon"><em class="fas fa-search"></em></div>
-      <input ng-model="ctrl.searchstring" ng-change="ctrl.Search()" class="form-control input-md"
-        ng-model-options="{debounce: 400}" />
-    </div>
-  </div>
-</div>
-<button type="button" ng-click="ctrl.loadData()" ng-disabled="ctrl.loading" translate lib="web">reload</button>
-<button type="button" ng-click="ctrl.DeleteMany()" ng-disabled="ctrl.loading" translate lib="web">empty</button>
-<div ng-show="ctrl.errormessage != ''"" class=" alert alert-danger" role="alert">{{ctrl.errormessage}}</div>
-<div class="row">
-  <table id="table1" class="table table-striped" when-scrolled="ctrl.more()" style="width: 100%;">
-    <thead class="thead-dark">
-      <tr>
-        <th ng-click="ctrl.ToggleOrder('_type')"><b translate lib="web">type</b></th>
-        <th ng-click="ctrl.ToggleOrder('_createdby')"><b translate lib="web">createdby</b></th>
-        <th ng-click="ctrl.ToggleOrder('host')"><b translate lib="web">host</b></th>
-        <th ng-click="ctrl.ToggleOrder('_created')"><b translate lib="web">created</b></th>
-        <th></th>
-        <th></th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr ng-repeat="model in ctrl.models">
-        <td>{{model._type}}</td>
-        <td>{{model._createdby}}</td>
-        <td>{{model.host}}</td>
-        <td>
-          <timesince ng-model="model._created" />
-        </td>
-        <td class="btn-cell">
-          {{model.message}}
-        </td>
-        <td>{{(model.initiator.length > 100) ? model.initiator.substr(0, 100 - 1) : model.initiator }}</td>
-      </tr>
-    </tbody>
-  </table>
\ No newline at end of file
diff --git a/OpenFlow/src/public/languages/da-DK/web.json b/OpenFlow/src/public/languages/da-DK/web.json
index 6bf8f907..1290885f 100644
--- a/OpenFlow/src/public/languages/da-DK/web.json
+++ b/OpenFlow/src/public/languages/da-DK/web.json
@@ -128,5 +128,14 @@
     "queue": "Kø",
     "lastrun": "Sidste kørt",
     "nextrun": "Næste Kørsel",
-    "autocreate": "Auto operet"
+    "autocreate": "Auto operet",
+    "forceddomains": "Tvangs domæner",
+    "addforceddomains": "Tilføj tvungen domæne",
+    "emailhistdetails": "Mail historik",
+    "validated": "Valideret",
+    "emailvalidated": "Email valideret",
+    "formvalidated": "Form valideret",
+    "formresources": "Form ressourcer",
+    "formresource": "Form ressource",
+    "addformresource": "Tilføj form ressource"
 }
\ No newline at end of file
diff --git a/OpenFlow/src/public/languages/en-US/web.json b/OpenFlow/src/public/languages/en-US/web.json
index 65319a80..02bd2411 100644
--- a/OpenFlow/src/public/languages/en-US/web.json
+++ b/OpenFlow/src/public/languages/en-US/web.json
@@ -128,5 +128,13 @@
     "queue": "Queue",
     "lastrun": "Last run",
     "nextrun": "Next run",
-    "autocreate": "Auto Create"
+    "forceddomains": "Forced domains",
+    "addforceddomains": "Add forced domain",
+    "emailhistdetails": "Mail history details",
+    "validated": "Validated",
+    "emailvalidated": "Email validated",
+    "formvalidated": "Form validated",
+    "formresources": "Form resources",
+    "formresource": "Form resource",
+    "addformresource": "Add form resource"
 }
\ No newline at end of file
diff --git a/OpenFlowNodeRED/package-lock.json b/OpenFlowNodeRED/package-lock.json
index 7c024be3..b05945aa 100644
--- a/OpenFlowNodeRED/package-lock.json
+++ b/OpenFlowNodeRED/package-lock.json
@@ -1,16 +1,16 @@
 {
   "name": "@openiap/nodered",
-  "version": "1.4.13",
+  "version": "1.4.14",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@openiap/nodered",
-      "version": "1.4.13",
+      "version": "1.4.14",
       "license": "MPL-2.0",
       "dependencies": {
         "@nodemailer/mailparser2": "^1.0.3",
-        "@openiap/openflow-api": "^2.0.11",
+        "@openiap/openflow-api": "^2.0.13",
         "@opentelemetry/api": "1.0.0-rc.3",
         "@opentelemetry/core": "0.19.0",
         "@opentelemetry/exporter-collector-grpc": "0.19.0",
@@ -30,7 +30,7 @@
         "pako": "^2.0.4",
         "passport-saml": "^3.2.0",
         "passport-saml-metadata": "^2.5.0",
-        "pm2": "^4.5.6",
+        "pm2": "^5.2.0",
         "readline-sync": "^1.4.10",
         "request": "^2.88.2",
         "smtp-server": "^3.9.0",
@@ -505,9 +505,9 @@
       }
     },
     "node_modules/@openiap/openflow-api": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/@openiap/openflow-api/-/openflow-api-2.0.11.tgz",
-      "integrity": "sha512-++2E3gSv07oIGkGU18SNlC0q4t2UpKH5mIdMx6WE9Yf6B2zE3d1zah5E+iVQqfdqRLV5WzxS1zCQJC1FBQr23Q==",
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/@openiap/openflow-api/-/openflow-api-2.0.13.tgz",
+      "integrity": "sha512-DE5833vUf061u4pUp+R3+zx5qKji9in/jhnlzXe9QNr1iH013CW1GEDGU3ZxlvFD3NEc68vdgVt/7PgMDfs/sw==",
       "dependencies": {
         "envfile": "^6.9.0",
         "fs-extra": "^9.0.1",
@@ -648,33 +648,34 @@
       }
     },
     "node_modules/@pm2/agent": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@pm2/agent/-/agent-1.0.8.tgz",
-      "integrity": "sha512-r8mud8BhBz+a2yjlgtk+PBXUR5EQ9UKSJCs232OxfCmuBr1MZw0Mo+Kfog6WJ8OmVk99r1so9yTUK4IyrgGcMQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@pm2/agent/-/agent-2.0.1.tgz",
+      "integrity": "sha512-QKHMm6yexcvdDfcNE7PL9D6uEjoQPGRi+8dh+rc4Hwtbpsbh5IAvZbz3BVGjcd4HaX6pt2xGpOohG7/Y2L4QLw==",
       "dependencies": {
         "async": "~3.2.0",
         "chalk": "~3.0.0",
         "dayjs": "~1.8.24",
         "debug": "~4.3.1",
         "eventemitter2": "~5.0.1",
+        "fast-json-patch": "^3.0.0-1",
         "fclone": "~1.0.11",
         "nssocket": "0.6.0",
         "pm2-axon": "~4.0.1",
         "pm2-axon-rpc": "~0.7.0",
-        "proxy-agent": "~4.0.1",
+        "proxy-agent": "~5.0.0",
         "semver": "~7.2.0",
-        "ws": "~7.2.0"
+        "ws": "~7.4.0"
       }
     },
     "node_modules/@pm2/agent/node_modules/async": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.1.tgz",
-      "integrity": "sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg=="
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
+      "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="
     },
     "node_modules/@pm2/agent/node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -704,9 +705,9 @@
       }
     },
     "node_modules/@pm2/agent/node_modules/ws": {
-      "version": "7.2.5",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.5.tgz",
-      "integrity": "sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA==",
+      "version": "7.4.6",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
+      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
       "engines": {
         "node": ">=8.3.0"
       },
@@ -1211,12 +1212,12 @@
     "node_modules/amp": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/amp/-/amp-0.3.1.tgz",
-      "integrity": "sha1-at+NWKdPNh6CwfqNOJwHnhOfxH0="
+      "integrity": "sha512-OwIuC4yZaRogHKiuU5WlMR5Xk/jAcpPtawWL05Gj8Lvm2F6mwoJt4O/bHI+DHwG79vWd+8OFYM4/BzYqyRd3qw=="
     },
     "node_modules/amp-message": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/amp-message/-/amp-message-0.1.2.tgz",
-      "integrity": "sha1-p48cmJlQh602GSpBKY5NtJ49/EU=",
+      "integrity": "sha512-JqutcFwoU1+jhv7ArgW38bqrE+LQdcRv4NxNw0mp0JHQyB6tXesWRjtYKlDgHRY2o3JE5UTaBGUK8kSWUdxWUg==",
       "dependencies": {
         "amp": "0.3.1"
       }
@@ -2212,13 +2213,10 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/cron": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/cron/-/cron-1.8.2.tgz",
-      "integrity": "sha512-Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg==",
-      "dependencies": {
-        "moment-timezone": "^0.5.x"
-      }
+    "node_modules/croner": {
+      "version": "4.1.97",
+      "resolved": "https://registry.npmjs.org/croner/-/croner-4.1.97.tgz",
+      "integrity": "sha512-/f6gpQuxDaqXu+1kwQYSckUglPaOrHdbIlBAu0YuW8/Cdb45XwXYNUBXg3r/9Mo6n540Kn/smKcZWko5x99KrQ=="
     },
     "node_modules/cronosjs": {
       "version": "1.7.1",
@@ -2389,13 +2387,14 @@
       }
     },
     "node_modules/degenerator": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-2.2.0.tgz",
-      "integrity": "sha512-aiQcQowF01RxFI4ZLFMpzyotbQonhNpBao6dkI8JPk5a+hmSjR5ErHp2CQySmQe8os3VBqLCIh87nDBgZXvsmg==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-3.0.2.tgz",
+      "integrity": "sha512-c0mef3SNQo56t6urUU6tdQAs+ThoD0o9B9MJ8HEt7NQcGEILCRFqQb7ZbP9JAv+QF1Ky5plydhMR/IrqWDm+TQ==",
       "dependencies": {
         "ast-types": "^0.13.2",
         "escodegen": "^1.8.1",
-        "esprima": "^4.0.0"
+        "esprima": "^4.0.0",
+        "vm2": "^3.9.8"
       },
       "engines": {
         "node": ">= 6"
@@ -2715,7 +2714,7 @@
     "node_modules/eventemitter2": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-5.0.1.tgz",
-      "integrity": "sha1-YZegldX7a1folC9v1+qtY6CclFI="
+      "integrity": "sha512-5EM1GHXycJBS6mauYAbVKT1cVs7POKWb2NXD4Vyt8dDqeZa7LaDK1/sjtL+Zb0lzTpSNil4596Dyu97hz37QLg=="
     },
     "node_modules/express": {
       "version": "4.17.2",
@@ -2801,6 +2800,11 @@
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
+    "node_modules/fast-json-patch": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.1.1.tgz",
+      "integrity": "sha512-vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ=="
+    },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -2809,7 +2813,7 @@
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
     },
     "node_modules/fast-text-encoding": {
       "version": "1.0.3",
@@ -2819,7 +2823,7 @@
     "node_modules/fclone": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/fclone/-/fclone-1.0.11.tgz",
-      "integrity": "sha1-EOhdo4v+p/xZk0HClu4ddyZu5kA="
+      "integrity": "sha512-GDqVQezKzRABdeqflsgMr7ktzgF9CyS+p2oe0jJqUY6izSSbhPIQJDpoU4PtGcD7VPM9xh/dVrTu6z1nwgmEGw=="
     },
     "node_modules/fecha": {
       "version": "4.2.1",
@@ -2997,7 +3001,7 @@
     "node_modules/ftp": {
       "version": "0.3.10",
       "resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
-      "integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=",
+      "integrity": "sha512-faFVML1aBx2UoDStmLwv2Wptt4vw5x03xxX172nhA5Y5HBshW5JweqQ2W4xL4dezQTG8inJsuYcpPHHU3X5OTQ==",
       "dependencies": {
         "readable-stream": "1.1.x",
         "xregexp": "2.0.0"
@@ -3113,9 +3117,9 @@
       }
     },
     "node_modules/get-uri/node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -3144,7 +3148,7 @@
     "node_modules/get-uri/node_modules/jsonfile": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
       "optionalDependencies": {
         "graceful-fs": "^4.1.6"
       }
@@ -3443,9 +3447,9 @@
       }
     },
     "node_modules/http-proxy-agent/node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -3591,9 +3595,9 @@
       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
     },
     "node_modules/ip": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
+      "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="
     },
     "node_modules/ipaddr.js": {
       "version": "1.9.1",
@@ -3888,7 +3892,7 @@
     "node_modules/lazy": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/lazy/-/lazy-1.0.11.tgz",
-      "integrity": "sha1-2qBoIGKCVCwIgojpdcKXwa53tpA=",
+      "integrity": "sha512-Y+CjUfLmIpoUCCRl0ub4smrYtGGr5AOa2AKOaWelGHOGz33X/Y/KizefGqbkwfz44+cnq/+9habclf8vOmu2LA==",
       "engines": {
         "node": ">=0.2.0"
       }
@@ -3904,7 +3908,7 @@
     "node_modules/levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
       "dependencies": {
         "prelude-ls": "~1.1.2",
         "type-check": "~0.3.2"
@@ -4709,7 +4713,7 @@
     "node_modules/nssocket": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/nssocket/-/nssocket-0.6.0.tgz",
-      "integrity": "sha1-Wflvb/MhVm8zxw99vu7N/cBxVPo=",
+      "integrity": "sha512-a9GSOIql5IqgWJR3F/JXG4KpJTA3Z53Cj0MeMvGpglytB1nxE4PdFNC0jINe27CS7cGivoynwc054EzCcT3M3w==",
       "dependencies": {
         "eventemitter2": "~0.4.14",
         "lazy": "~1.0.11"
@@ -4721,7 +4725,7 @@
     "node_modules/nssocket/node_modules/eventemitter2": {
       "version": "0.4.14",
       "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz",
-      "integrity": "sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas="
+      "integrity": "sha512-K7J4xq5xAD5jHsGM5ReWXRTFa3JRGofHiMcVgQ8PRwgWxzjHpMWCIzsmyf60+mh8KLsqYPcjUMa0AC4hd6lPyQ=="
     },
     "node_modules/nth-check": {
       "version": "2.0.1",
@@ -4866,9 +4870,9 @@
       }
     },
     "node_modules/pac-proxy-agent": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-4.1.0.tgz",
-      "integrity": "sha512-ejNgYm2HTXSIYX9eFlkvqFp8hyJ374uDf0Zq5YUAifiSh1D6fo+iBivQZirGvVv8dCYUsLhmLBRhlAYvBKI5+Q==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-CcFG3ZtnxO8McDigozwE3AqAw15zDvGH+OjXO4kzf7IkEKkQ4gxQ+3sdF50WmhQ4P/bVusXcqNE2S3XrNURwzQ==",
       "dependencies": {
         "@tootallnate/once": "1",
         "agent-base": "6",
@@ -4876,18 +4880,18 @@
         "get-uri": "3",
         "http-proxy-agent": "^4.0.1",
         "https-proxy-agent": "5",
-        "pac-resolver": "^4.1.0",
+        "pac-resolver": "^5.0.0",
         "raw-body": "^2.2.0",
         "socks-proxy-agent": "5"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 8"
       }
     },
     "node_modules/pac-proxy-agent/node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -4906,16 +4910,16 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "node_modules/pac-resolver": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-4.2.0.tgz",
-      "integrity": "sha512-rPACZdUyuxT5Io/gFKUeeZFfE5T7ve7cAkE5TUZRRfuKP0u5Hocwe48X7ZEm6mYB+bTB0Qf+xlVlA/RM/i6RCQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-5.0.1.tgz",
+      "integrity": "sha512-cy7u00ko2KVgBAjuhevqpPeHIkCIqPe1v24cydhWjmeuzaBfmUWFCZJ1iAh5TuVzVZoUzXIW7K8sMYOZ84uZ9Q==",
       "dependencies": {
-        "degenerator": "^2.2.0",
+        "degenerator": "^3.0.2",
         "ip": "^1.1.5",
-        "netmask": "^2.0.1"
+        "netmask": "^2.0.2"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 8"
       }
     },
     "node_modules/pako": {
@@ -5121,22 +5125,22 @@
       }
     },
     "node_modules/pidusage": {
-      "version": "2.0.21",
-      "resolved": "https://registry.npmjs.org/pidusage/-/pidusage-2.0.21.tgz",
-      "integrity": "sha512-cv3xAQos+pugVX+BfXpHsbyz/dLzX+lr44zNMsYiGxUw+kV5sgQCIcLd1z+0vq+KyC7dJ+/ts2PsfgWfSC3WXA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pidusage/-/pidusage-3.0.0.tgz",
+      "integrity": "sha512-8VJLToXhj+RYZGNVw8oxc7dS54iCQXUJ+MDFHezQ/fwF5B8W4OWodAMboc1wb08S/4LiHwAmkT4ohf/d3YPPsw==",
       "dependencies": {
         "safe-buffer": "^5.2.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       }
     },
     "node_modules/pm2": {
-      "version": "4.5.6",
-      "resolved": "https://registry.npmjs.org/pm2/-/pm2-4.5.6.tgz",
-      "integrity": "sha512-4J5q704Xl6VmpmQhXFGMJL4kXyyQw3AZM1FE9vRxhS3LiDI/+WVBtOM6pqJ4g/RKW+AUjEkc23i/DCC4BVenDA==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/pm2/-/pm2-5.2.0.tgz",
+      "integrity": "sha512-PO5hMVhQ85cTszFM++6v07Me9hPJMkFbHjkFigtMMk+La8ty2wCi2dlBTeZYJDhPUSjK8Ccltpq2buNRcyMOTw==",
       "dependencies": {
-        "@pm2/agent": "~1.0.8",
+        "@pm2/agent": "~2.0.0",
         "@pm2/io": "~5.0.0",
         "@pm2/js-api": "~0.6.7",
         "@pm2/pm2-version-check": "latest",
@@ -5146,7 +5150,7 @@
         "chokidar": "^3.5.1",
         "cli-tableau": "^2.0.0",
         "commander": "2.15.1",
-        "cron": "1.8.2",
+        "croner": "~4.1.92",
         "dayjs": "~1.8.25",
         "debug": "^4.3.1",
         "enquirer": "2.3.6",
@@ -5154,17 +5158,16 @@
         "fclone": "1.0.11",
         "mkdirp": "1.0.4",
         "needle": "2.4.0",
-        "pidusage": "2.0.21",
+        "pidusage": "~3.0",
         "pm2-axon": "~4.0.1",
-        "pm2-axon-rpc": "~0.7.0",
+        "pm2-axon-rpc": "~0.7.1",
         "pm2-deploy": "~1.0.2",
         "pm2-multimeter": "^0.1.2",
         "promptly": "^2",
-        "ps-list": "6.3.0",
         "semver": "^7.2",
         "source-map-support": "0.5.19",
         "sprintf-js": "1.1.2",
-        "vizion": "2.2.1",
+        "vizion": "~2.2.1",
         "yamljs": "0.3.0"
       },
       "bin": {
@@ -5174,7 +5177,10 @@
         "pm2-runtime": "bin/pm2-runtime"
       },
       "engines": {
-        "node": ">=8.10.0"
+        "node": ">=10.0.0"
+      },
+      "optionalDependencies": {
+        "pm2-sysmonit": "^1.2.8"
       }
     },
     "node_modules/pm2-axon": {
@@ -5203,9 +5209,9 @@
       }
     },
     "node_modules/pm2-axon-rpc/node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -5224,9 +5230,9 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "node_modules/pm2-axon/node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -5264,6 +5270,60 @@
         "charm": "~0.1.1"
       }
     },
+    "node_modules/pm2-sysmonit": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/pm2-sysmonit/-/pm2-sysmonit-1.2.8.tgz",
+      "integrity": "sha512-ACOhlONEXdCTVwKieBIQLSi2tQZ8eKinhcr9JpZSUAL8Qy0ajIgRtsLxG/lwPOW3JEKqPyw/UaHmTWhUzpP4kA==",
+      "optional": true,
+      "dependencies": {
+        "async": "^3.2.0",
+        "debug": "^4.3.1",
+        "pidusage": "^2.0.21",
+        "systeminformation": "^5.7",
+        "tx2": "~1.0.4"
+      }
+    },
+    "node_modules/pm2-sysmonit/node_modules/async": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
+      "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
+      "optional": true
+    },
+    "node_modules/pm2-sysmonit/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "optional": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/pm2-sysmonit/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "optional": true
+    },
+    "node_modules/pm2-sysmonit/node_modules/pidusage": {
+      "version": "2.0.21",
+      "resolved": "https://registry.npmjs.org/pidusage/-/pidusage-2.0.21.tgz",
+      "integrity": "sha512-cv3xAQos+pugVX+BfXpHsbyz/dLzX+lr44zNMsYiGxUw+kV5sgQCIcLd1z+0vq+KyC7dJ+/ts2PsfgWfSC3WXA==",
+      "optional": true,
+      "dependencies": {
+        "safe-buffer": "^5.2.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/pm2/node_modules/async": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/async/-/async-3.2.1.tgz",
@@ -5293,7 +5353,7 @@
     "node_modules/prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
       "engines": {
         "node": ">= 0.8.0"
       }
@@ -5349,27 +5409,27 @@
       }
     },
     "node_modules/proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-ODnQnW2jc/FUVwHHuaZEfN5otg/fMbvMxz9nMSUQfJ9JU7q2SZvSULSsjLloVgJOiv9yhc8GlNMKc4GkFmcVEA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-gkH7BkvLVkSfX9Dk27W6TyNOWWZWRilRfk1XxGNWOYJ2TuedAv1yFpCaU9QSBmBe716XOTNpYNOzhysyw8xn7g==",
       "dependencies": {
         "agent-base": "^6.0.0",
         "debug": "4",
         "http-proxy-agent": "^4.0.0",
         "https-proxy-agent": "^5.0.0",
         "lru-cache": "^5.1.1",
-        "pac-proxy-agent": "^4.1.0",
+        "pac-proxy-agent": "^5.0.0",
         "proxy-from-env": "^1.0.0",
         "socks-proxy-agent": "^5.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">= 8"
       }
     },
     "node_modules/proxy-agent/node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -5405,14 +5465,6 @@
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
     },
-    "node_modules/ps-list": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/ps-list/-/ps-list-6.3.0.tgz",
-      "integrity": "sha512-qau0czUSB0fzSlBOQt0bo+I2v6R+xiQdj78e1BR/Qjfl5OHWJ/urXi8+ilw1eHe+5hSeDI1wrwVTgDp2wst4oA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
@@ -5898,12 +5950,12 @@
       }
     },
     "node_modules/socks": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.6.1.tgz",
-      "integrity": "sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA==",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.6.2.tgz",
+      "integrity": "sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==",
       "dependencies": {
         "ip": "^1.1.5",
-        "smart-buffer": "^4.1.0"
+        "smart-buffer": "^4.2.0"
       },
       "engines": {
         "node": ">= 10.13.0",
@@ -5924,9 +5976,9 @@
       }
     },
     "node_modules/socks-proxy-agent/node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -6070,6 +6122,32 @@
         "node": ">=8"
       }
     },
+    "node_modules/systeminformation": {
+      "version": "5.11.16",
+      "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.11.16.tgz",
+      "integrity": "sha512-/a1VfP9WELKLT330yhAHJ4lWCXRYynel1kMMHKc/qdzCgDt3BIcMlo+3tKcTiRHFefjV3fz4AvqMx7dGO/72zw==",
+      "optional": true,
+      "os": [
+        "darwin",
+        "linux",
+        "win32",
+        "freebsd",
+        "openbsd",
+        "netbsd",
+        "sunos",
+        "android"
+      ],
+      "bin": {
+        "systeminformation": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      },
+      "funding": {
+        "type": "Buy me a coffee",
+        "url": "https://www.buymeacoffee.com/systeminfo"
+      }
+    },
     "node_modules/tar": {
       "version": "6.1.11",
       "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
@@ -6170,6 +6248,15 @@
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
     },
+    "node_modules/tx2": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tx2/-/tx2-1.0.5.tgz",
+      "integrity": "sha512-sJ24w0y03Md/bxzK4FU8J8JveYYUbSs2FViLJ2D/8bytSiyPRbuE3DyL/9UKYXTZlV3yXq0L8GLlhobTnekCVg==",
+      "optional": true,
+      "dependencies": {
+        "json-stringify-safe": "^5.0.1"
+      }
+    },
     "node_modules/type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -6356,6 +6443,21 @@
         "lodash": "^4.17.14"
       }
     },
+    "node_modules/vm2": {
+      "version": "3.9.9",
+      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.9.tgz",
+      "integrity": "sha512-xwTm7NLh/uOjARRBs8/95H0e8fT3Ukw5D/JJWhxMbhKzNh1Nu981jQKvkep9iKYNxzlVrdzD0mlBGkDKZWprlw==",
+      "dependencies": {
+        "acorn": "^8.7.0",
+        "acorn-walk": "^8.2.0"
+      },
+      "bin": {
+        "vm2": "bin/vm2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
     "node_modules/webidl-conversions": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
@@ -6964,9 +7066,9 @@
       }
     },
     "@openiap/openflow-api": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/@openiap/openflow-api/-/openflow-api-2.0.11.tgz",
-      "integrity": "sha512-++2E3gSv07oIGkGU18SNlC0q4t2UpKH5mIdMx6WE9Yf6B2zE3d1zah5E+iVQqfdqRLV5WzxS1zCQJC1FBQr23Q==",
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/@openiap/openflow-api/-/openflow-api-2.0.13.tgz",
+      "integrity": "sha512-DE5833vUf061u4pUp+R3+zx5qKji9in/jhnlzXe9QNr1iH013CW1GEDGU3ZxlvFD3NEc68vdgVt/7PgMDfs/sw==",
       "requires": {
         "envfile": "^6.9.0",
         "fs-extra": "^9.0.1",
@@ -7055,33 +7157,34 @@
       }
     },
     "@pm2/agent": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@pm2/agent/-/agent-1.0.8.tgz",
-      "integrity": "sha512-r8mud8BhBz+a2yjlgtk+PBXUR5EQ9UKSJCs232OxfCmuBr1MZw0Mo+Kfog6WJ8OmVk99r1so9yTUK4IyrgGcMQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@pm2/agent/-/agent-2.0.1.tgz",
+      "integrity": "sha512-QKHMm6yexcvdDfcNE7PL9D6uEjoQPGRi+8dh+rc4Hwtbpsbh5IAvZbz3BVGjcd4HaX6pt2xGpOohG7/Y2L4QLw==",
       "requires": {
         "async": "~3.2.0",
         "chalk": "~3.0.0",
         "dayjs": "~1.8.24",
         "debug": "~4.3.1",
         "eventemitter2": "~5.0.1",
+        "fast-json-patch": "^3.0.0-1",
         "fclone": "~1.0.11",
         "nssocket": "0.6.0",
         "pm2-axon": "~4.0.1",
         "pm2-axon-rpc": "~0.7.0",
-        "proxy-agent": "~4.0.1",
+        "proxy-agent": "~5.0.0",
         "semver": "~7.2.0",
-        "ws": "~7.2.0"
+        "ws": "~7.4.0"
       },
       "dependencies": {
         "async": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/async/-/async-3.2.1.tgz",
-          "integrity": "sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg=="
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
+          "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="
         },
         "debug": {
-          "version": "4.3.2",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-          "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "requires": {
             "ms": "2.1.2"
           }
@@ -7097,9 +7200,9 @@
           "integrity": "sha512-utbW9Z7ZxVvwiIWkdOMLOR9G/NFXh2aRucghkVrEMJWuC++r3lCkBC3LwqBinyHzGMAJxY5tn6VakZGHObq5ig=="
         },
         "ws": {
-          "version": "7.2.5",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.5.tgz",
-          "integrity": "sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA==",
+          "version": "7.4.6",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
+          "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
           "requires": {}
         }
       }
@@ -7508,12 +7611,12 @@
     "amp": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/amp/-/amp-0.3.1.tgz",
-      "integrity": "sha1-at+NWKdPNh6CwfqNOJwHnhOfxH0="
+      "integrity": "sha512-OwIuC4yZaRogHKiuU5WlMR5Xk/jAcpPtawWL05Gj8Lvm2F6mwoJt4O/bHI+DHwG79vWd+8OFYM4/BzYqyRd3qw=="
     },
     "amp-message": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/amp-message/-/amp-message-0.1.2.tgz",
-      "integrity": "sha1-p48cmJlQh602GSpBKY5NtJ49/EU=",
+      "integrity": "sha512-JqutcFwoU1+jhv7ArgW38bqrE+LQdcRv4NxNw0mp0JHQyB6tXesWRjtYKlDgHRY2o3JE5UTaBGUK8kSWUdxWUg==",
       "requires": {
         "amp": "0.3.1"
       }
@@ -8293,13 +8396,10 @@
         "vary": "^1"
       }
     },
-    "cron": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/cron/-/cron-1.8.2.tgz",
-      "integrity": "sha512-Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg==",
-      "requires": {
-        "moment-timezone": "^0.5.x"
-      }
+    "croner": {
+      "version": "4.1.97",
+      "resolved": "https://registry.npmjs.org/croner/-/croner-4.1.97.tgz",
+      "integrity": "sha512-/f6gpQuxDaqXu+1kwQYSckUglPaOrHdbIlBAu0YuW8/Cdb45XwXYNUBXg3r/9Mo6n540Kn/smKcZWko5x99KrQ=="
     },
     "cronosjs": {
       "version": "1.7.1",
@@ -8420,13 +8520,14 @@
       "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="
     },
     "degenerator": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-2.2.0.tgz",
-      "integrity": "sha512-aiQcQowF01RxFI4ZLFMpzyotbQonhNpBao6dkI8JPk5a+hmSjR5ErHp2CQySmQe8os3VBqLCIh87nDBgZXvsmg==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-3.0.2.tgz",
+      "integrity": "sha512-c0mef3SNQo56t6urUU6tdQAs+ThoD0o9B9MJ8HEt7NQcGEILCRFqQb7ZbP9JAv+QF1Ky5plydhMR/IrqWDm+TQ==",
       "requires": {
         "ast-types": "^0.13.2",
         "escodegen": "^1.8.1",
-        "esprima": "^4.0.0"
+        "esprima": "^4.0.0",
+        "vm2": "^3.9.8"
       }
     },
     "delayed-stream": {
@@ -8668,7 +8769,7 @@
     "eventemitter2": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-5.0.1.tgz",
-      "integrity": "sha1-YZegldX7a1folC9v1+qtY6CclFI="
+      "integrity": "sha512-5EM1GHXycJBS6mauYAbVKT1cVs7POKWb2NXD4Vyt8dDqeZa7LaDK1/sjtL+Zb0lzTpSNil4596Dyu97hz37QLg=="
     },
     "express": {
       "version": "4.17.2",
@@ -8744,6 +8845,11 @@
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
+    "fast-json-patch": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.1.1.tgz",
+      "integrity": "sha512-vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ=="
+    },
     "fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -8752,7 +8858,7 @@
     "fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
     },
     "fast-text-encoding": {
       "version": "1.0.3",
@@ -8762,7 +8868,7 @@
     "fclone": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/fclone/-/fclone-1.0.11.tgz",
-      "integrity": "sha1-EOhdo4v+p/xZk0HClu4ddyZu5kA="
+      "integrity": "sha512-GDqVQezKzRABdeqflsgMr7ktzgF9CyS+p2oe0jJqUY6izSSbhPIQJDpoU4PtGcD7VPM9xh/dVrTu6z1nwgmEGw=="
     },
     "fecha": {
       "version": "4.2.1",
@@ -8888,7 +8994,7 @@
     "ftp": {
       "version": "0.3.10",
       "resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
-      "integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=",
+      "integrity": "sha512-faFVML1aBx2UoDStmLwv2Wptt4vw5x03xxX172nhA5Y5HBshW5JweqQ2W4xL4dezQTG8inJsuYcpPHHU3X5OTQ==",
       "requires": {
         "readable-stream": "1.1.x",
         "xregexp": "2.0.0"
@@ -8982,9 +9088,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.3.2",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-          "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "requires": {
             "ms": "2.1.2"
           }
@@ -9002,7 +9108,7 @@
         "jsonfile": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+          "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
           "requires": {
             "graceful-fs": "^4.1.6"
           }
@@ -9243,9 +9349,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.3.2",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-          "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "requires": {
             "ms": "2.1.2"
           }
@@ -9338,9 +9444,9 @@
       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
     },
     "ip": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
+      "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="
     },
     "ipaddr.js": {
       "version": "1.9.1",
@@ -9594,7 +9700,7 @@
     "lazy": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/lazy/-/lazy-1.0.11.tgz",
-      "integrity": "sha1-2qBoIGKCVCwIgojpdcKXwa53tpA="
+      "integrity": "sha512-Y+CjUfLmIpoUCCRl0ub4smrYtGGr5AOa2AKOaWelGHOGz33X/Y/KizefGqbkwfz44+cnq/+9habclf8vOmu2LA=="
     },
     "leven": {
       "version": "2.1.0",
@@ -9604,7 +9710,7 @@
     "levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
       "requires": {
         "prelude-ls": "~1.1.2",
         "type-check": "~0.3.2"
@@ -10231,7 +10337,7 @@
     "nssocket": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/nssocket/-/nssocket-0.6.0.tgz",
-      "integrity": "sha1-Wflvb/MhVm8zxw99vu7N/cBxVPo=",
+      "integrity": "sha512-a9GSOIql5IqgWJR3F/JXG4KpJTA3Z53Cj0MeMvGpglytB1nxE4PdFNC0jINe27CS7cGivoynwc054EzCcT3M3w==",
       "requires": {
         "eventemitter2": "~0.4.14",
         "lazy": "~1.0.11"
@@ -10240,7 +10346,7 @@
         "eventemitter2": {
           "version": "0.4.14",
           "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz",
-          "integrity": "sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas="
+          "integrity": "sha512-K7J4xq5xAD5jHsGM5ReWXRTFa3JRGofHiMcVgQ8PRwgWxzjHpMWCIzsmyf60+mh8KLsqYPcjUMa0AC4hd6lPyQ=="
         }
       }
     },
@@ -10353,9 +10459,9 @@
       "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="
     },
     "pac-proxy-agent": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-4.1.0.tgz",
-      "integrity": "sha512-ejNgYm2HTXSIYX9eFlkvqFp8hyJ374uDf0Zq5YUAifiSh1D6fo+iBivQZirGvVv8dCYUsLhmLBRhlAYvBKI5+Q==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-CcFG3ZtnxO8McDigozwE3AqAw15zDvGH+OjXO4kzf7IkEKkQ4gxQ+3sdF50WmhQ4P/bVusXcqNE2S3XrNURwzQ==",
       "requires": {
         "@tootallnate/once": "1",
         "agent-base": "6",
@@ -10363,15 +10469,15 @@
         "get-uri": "3",
         "http-proxy-agent": "^4.0.1",
         "https-proxy-agent": "5",
-        "pac-resolver": "^4.1.0",
+        "pac-resolver": "^5.0.0",
         "raw-body": "^2.2.0",
         "socks-proxy-agent": "5"
       },
       "dependencies": {
         "debug": {
-          "version": "4.3.2",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-          "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "requires": {
             "ms": "2.1.2"
           }
@@ -10384,13 +10490,13 @@
       }
     },
     "pac-resolver": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-4.2.0.tgz",
-      "integrity": "sha512-rPACZdUyuxT5Io/gFKUeeZFfE5T7ve7cAkE5TUZRRfuKP0u5Hocwe48X7ZEm6mYB+bTB0Qf+xlVlA/RM/i6RCQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-5.0.1.tgz",
+      "integrity": "sha512-cy7u00ko2KVgBAjuhevqpPeHIkCIqPe1v24cydhWjmeuzaBfmUWFCZJ1iAh5TuVzVZoUzXIW7K8sMYOZ84uZ9Q==",
       "requires": {
-        "degenerator": "^2.2.0",
+        "degenerator": "^3.0.2",
         "ip": "^1.1.5",
-        "netmask": "^2.0.1"
+        "netmask": "^2.0.2"
       }
     },
     "pako": {
@@ -10547,19 +10653,19 @@
       "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="
     },
     "pidusage": {
-      "version": "2.0.21",
-      "resolved": "https://registry.npmjs.org/pidusage/-/pidusage-2.0.21.tgz",
-      "integrity": "sha512-cv3xAQos+pugVX+BfXpHsbyz/dLzX+lr44zNMsYiGxUw+kV5sgQCIcLd1z+0vq+KyC7dJ+/ts2PsfgWfSC3WXA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pidusage/-/pidusage-3.0.0.tgz",
+      "integrity": "sha512-8VJLToXhj+RYZGNVw8oxc7dS54iCQXUJ+MDFHezQ/fwF5B8W4OWodAMboc1wb08S/4LiHwAmkT4ohf/d3YPPsw==",
       "requires": {
         "safe-buffer": "^5.2.1"
       }
     },
     "pm2": {
-      "version": "4.5.6",
-      "resolved": "https://registry.npmjs.org/pm2/-/pm2-4.5.6.tgz",
-      "integrity": "sha512-4J5q704Xl6VmpmQhXFGMJL4kXyyQw3AZM1FE9vRxhS3LiDI/+WVBtOM6pqJ4g/RKW+AUjEkc23i/DCC4BVenDA==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/pm2/-/pm2-5.2.0.tgz",
+      "integrity": "sha512-PO5hMVhQ85cTszFM++6v07Me9hPJMkFbHjkFigtMMk+La8ty2wCi2dlBTeZYJDhPUSjK8Ccltpq2buNRcyMOTw==",
       "requires": {
-        "@pm2/agent": "~1.0.8",
+        "@pm2/agent": "~2.0.0",
         "@pm2/io": "~5.0.0",
         "@pm2/js-api": "~0.6.7",
         "@pm2/pm2-version-check": "latest",
@@ -10569,7 +10675,7 @@
         "chokidar": "^3.5.1",
         "cli-tableau": "^2.0.0",
         "commander": "2.15.1",
-        "cron": "1.8.2",
+        "croner": "~4.1.92",
         "dayjs": "~1.8.25",
         "debug": "^4.3.1",
         "enquirer": "2.3.6",
@@ -10577,17 +10683,17 @@
         "fclone": "1.0.11",
         "mkdirp": "1.0.4",
         "needle": "2.4.0",
-        "pidusage": "2.0.21",
+        "pidusage": "~3.0",
         "pm2-axon": "~4.0.1",
-        "pm2-axon-rpc": "~0.7.0",
+        "pm2-axon-rpc": "~0.7.1",
         "pm2-deploy": "~1.0.2",
         "pm2-multimeter": "^0.1.2",
+        "pm2-sysmonit": "^1.2.8",
         "promptly": "^2",
-        "ps-list": "6.3.0",
         "semver": "^7.2",
         "source-map-support": "0.5.19",
         "sprintf-js": "1.1.2",
-        "vizion": "2.2.1",
+        "vizion": "~2.2.1",
         "yamljs": "0.3.0"
       },
       "dependencies": {
@@ -10623,9 +10729,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.3.2",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-          "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "requires": {
             "ms": "2.1.2"
           }
@@ -10646,9 +10752,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.3.2",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-          "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "requires": {
             "ms": "2.1.2"
           }
@@ -10677,10 +10783,55 @@
         "charm": "~0.1.1"
       }
     },
+    "pm2-sysmonit": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/pm2-sysmonit/-/pm2-sysmonit-1.2.8.tgz",
+      "integrity": "sha512-ACOhlONEXdCTVwKieBIQLSi2tQZ8eKinhcr9JpZSUAL8Qy0ajIgRtsLxG/lwPOW3JEKqPyw/UaHmTWhUzpP4kA==",
+      "optional": true,
+      "requires": {
+        "async": "^3.2.0",
+        "debug": "^4.3.1",
+        "pidusage": "^2.0.21",
+        "systeminformation": "^5.7",
+        "tx2": "~1.0.4"
+      },
+      "dependencies": {
+        "async": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
+          "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
+          "optional": true
+        },
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "optional": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "optional": true
+        },
+        "pidusage": {
+          "version": "2.0.21",
+          "resolved": "https://registry.npmjs.org/pidusage/-/pidusage-2.0.21.tgz",
+          "integrity": "sha512-cv3xAQos+pugVX+BfXpHsbyz/dLzX+lr44zNMsYiGxUw+kV5sgQCIcLd1z+0vq+KyC7dJ+/ts2PsfgWfSC3WXA==",
+          "optional": true,
+          "requires": {
+            "safe-buffer": "^5.2.1"
+          }
+        }
+      }
+    },
     "prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
+      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="
     },
     "process-nextick-args": {
       "version": "2.0.1",
@@ -10725,24 +10876,24 @@
       }
     },
     "proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-ODnQnW2jc/FUVwHHuaZEfN5otg/fMbvMxz9nMSUQfJ9JU7q2SZvSULSsjLloVgJOiv9yhc8GlNMKc4GkFmcVEA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-gkH7BkvLVkSfX9Dk27W6TyNOWWZWRilRfk1XxGNWOYJ2TuedAv1yFpCaU9QSBmBe716XOTNpYNOzhysyw8xn7g==",
       "requires": {
         "agent-base": "^6.0.0",
         "debug": "4",
         "http-proxy-agent": "^4.0.0",
         "https-proxy-agent": "^5.0.0",
         "lru-cache": "^5.1.1",
-        "pac-proxy-agent": "^4.1.0",
+        "pac-proxy-agent": "^5.0.0",
         "proxy-from-env": "^1.0.0",
         "socks-proxy-agent": "^5.0.0"
       },
       "dependencies": {
         "debug": {
-          "version": "4.3.2",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-          "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "requires": {
             "ms": "2.1.2"
           }
@@ -10772,11 +10923,6 @@
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
     },
-    "ps-list": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/ps-list/-/ps-list-6.3.0.tgz",
-      "integrity": "sha512-qau0czUSB0fzSlBOQt0bo+I2v6R+xiQdj78e1BR/Qjfl5OHWJ/urXi8+ilw1eHe+5hSeDI1wrwVTgDp2wst4oA=="
-    },
     "pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
@@ -11138,12 +11284,12 @@
       }
     },
     "socks": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.6.1.tgz",
-      "integrity": "sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA==",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.6.2.tgz",
+      "integrity": "sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==",
       "requires": {
         "ip": "^1.1.5",
-        "smart-buffer": "^4.1.0"
+        "smart-buffer": "^4.2.0"
       }
     },
     "socks-proxy-agent": {
@@ -11157,9 +11303,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.3.2",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-          "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "requires": {
             "ms": "2.1.2"
           }
@@ -11268,6 +11414,12 @@
         "has-flag": "^4.0.0"
       }
     },
+    "systeminformation": {
+      "version": "5.11.16",
+      "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.11.16.tgz",
+      "integrity": "sha512-/a1VfP9WELKLT330yhAHJ4lWCXRYynel1kMMHKc/qdzCgDt3BIcMlo+3tKcTiRHFefjV3fz4AvqMx7dGO/72zw==",
+      "optional": true
+    },
     "tar": {
       "version": "6.1.11",
       "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
@@ -11349,6 +11501,15 @@
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
     },
+    "tx2": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tx2/-/tx2-1.0.5.tgz",
+      "integrity": "sha512-sJ24w0y03Md/bxzK4FU8J8JveYYUbSs2FViLJ2D/8bytSiyPRbuE3DyL/9UKYXTZlV3yXq0L8GLlhobTnekCVg==",
+      "optional": true,
+      "requires": {
+        "json-stringify-safe": "^5.0.1"
+      }
+    },
     "type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -11497,6 +11658,15 @@
         }
       }
     },
+    "vm2": {
+      "version": "3.9.9",
+      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.9.tgz",
+      "integrity": "sha512-xwTm7NLh/uOjARRBs8/95H0e8fT3Ukw5D/JJWhxMbhKzNh1Nu981jQKvkep9iKYNxzlVrdzD0mlBGkDKZWprlw==",
+      "requires": {
+        "acorn": "^8.7.0",
+        "acorn-walk": "^8.2.0"
+      }
+    },
     "webidl-conversions": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
diff --git a/OpenFlowNodeRED/package.json b/OpenFlowNodeRED/package.json
index d09bb97e..b101037d 100644
--- a/OpenFlowNodeRED/package.json
+++ b/OpenFlowNodeRED/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openiap/nodered",
-  "version": "1.4.13",
+  "version": "1.4.14",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@nodemailer/mailparser2": "^1.0.3",
-    "@openiap/openflow-api": "^2.0.11",
+    "@openiap/openflow-api": "^2.0.13",
     "@opentelemetry/api": "1.0.0-rc.3",
     "@opentelemetry/core": "0.19.0",
     "@opentelemetry/exporter-collector-grpc": "0.19.0",
@@ -45,7 +45,7 @@
     "pako": "^2.0.4",
     "passport-saml": "^3.2.0",
     "passport-saml-metadata": "^2.5.0",
-    "pm2": "^4.5.6",
+    "pm2": "^5.2.0",
     "readline-sync": "^1.4.10",
     "request": "^2.88.2",
     "smtp-server": "^3.9.0",
diff --git a/OpenFlowNodeRED/src/Config.ts b/OpenFlowNodeRED/src/Config.ts
index db3c1aa3..194feb02 100644
--- a/OpenFlowNodeRED/src/Config.ts
+++ b/OpenFlowNodeRED/src/Config.ts
@@ -254,7 +254,7 @@ export class Config {
             if (Config.saml_ignore_cert) process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
             const reader: any = await fetch({ url });
             if (Config.saml_ignore_cert) process.env.NODE_TLS_REJECT_UNAUTHORIZED = "1";
-            if (reader === null || reader === undefined) { throw new Error("Failed getting result"); return; }
+            if (reader === null || reader === undefined) { throw new Error("Failed getting result"); }
             const config: any = toPassportConfig(reader);
             // we need this, for Office 365 :-/
             if (reader.signingCerts && reader.signingCerts.length > 1) {
diff --git a/OpenFlowNodeRED/src/WebServer.ts b/OpenFlowNodeRED/src/WebServer.ts
index 657b28db..6e5b264b 100644
--- a/OpenFlowNodeRED/src/WebServer.ts
+++ b/OpenFlowNodeRED/src/WebServer.ts
@@ -321,6 +321,7 @@ export class WebServer {
                 this.settings.httpNodeMiddleware = (req: express.Request, res: express.Response, next: express.NextFunction) => {
                     noderedcontribmiddlewareauth.process(socket, req, res, next);
                 };
+                this.settings.adminAuth.strategy.autoLogin = true
 
                 Logger.instanse.silly("WebServer.configure::configure nodered storageModule");
                 this.settings.storageModule = new noderedcontribopenflowstorage(socket);
diff --git a/OpenFlowNodeRED/src/node-red-contrib-auth-saml.ts b/OpenFlowNodeRED/src/node-red-contrib-auth-saml.ts
index e7bb6a95..b9a480b4 100644
--- a/OpenFlowNodeRED/src/node-red-contrib-auth-saml.ts
+++ b/OpenFlowNodeRED/src/node-red-contrib-auth-saml.ts
@@ -77,7 +77,7 @@ export class noderedcontribauthsaml {
             const backupStore = new FileSystemCache(path.join(Config.logpath, '.cache-' + Config.nodered_id));
             const reader: any = await fetch({ url, backupStore });
             if (Config.saml_ignore_cert) process.env.NODE_TLS_REJECT_UNAUTHORIZED = "1";
-            if (reader === null || reader === undefined) { throw new Error("Failed getting result"); return; }
+            if (reader === null || reader === undefined) { throw new Error("Failed getting result"); }
             const config: any = toPassportConfig(reader);
             // we need this, for Office 365 :-/
             if (reader.signingCerts && reader.signingCerts.length > 1) {
diff --git a/OpenFlowNodeRED/src/nodered/nodes/workflow_nodes.ts b/OpenFlowNodeRED/src/nodered/nodes/workflow_nodes.ts
index 2492a015..9c6cd90d 100644
--- a/OpenFlowNodeRED/src/nodered/nodes/workflow_nodes.ts
+++ b/OpenFlowNodeRED/src/nodered/nodes/workflow_nodes.ts
@@ -182,13 +182,6 @@ export class workflow_in_node {
                 data.jwt = data.payload.__jwt;
                 delete data.payload.__jwt;
             }
-            while (data.payload != null && data.payload.payload != null) {
-                data.payload = data.payload.payload;
-            }
-            // if (data.payload != null && data.payload.payload != null) {
-            //     // UGLy ROLLBACK!
-            //     data.payload = data.payload.payload;
-            // }
             let _id = data._id;
             if (_id === null || _id === undefined || _id === "") {
                 if (data.payload !== null && data.payload !== undefined) {
@@ -197,6 +190,14 @@ export class workflow_in_node {
                     }
                 }
             }
+
+            while (data.payload != null && data.payload.payload != null) {
+                data.payload = data.payload.payload;
+            }
+            // if (data.payload != null && data.payload.payload != null) {
+            //     // UGLy ROLLBACK!
+            //     data.payload = data.payload.payload;
+            // }
             if (_id !== null && _id !== undefined && _id !== "") {
                 this.node.status({ fill: "blue", shape: "dot", text: "Processing id " + _id });
                 const jwt = data.jwt;
@@ -586,7 +587,7 @@ export class assign_workflow_node {
                 }
             }
             if (_id !== null && _id !== undefined && _id !== "") {
-                const res = await NoderedUtil.Query({ collectionname: "workflow_instances", query: { "_id": _id }, projection: { parentid: 1 }, top: 1, jwt: data.jwt, priority });
+                const res = await NoderedUtil.Query({ collectionname: "workflow_instances", query: { "_id": _id }, projection: { "_parentid": 1 }, top: 1, jwt: data.jwt, priority });
                 if (res.length == 0) {
                     NoderedUtil.HandleError(this, "Unknown workflow_instances id " + _id, msg);
                     if (ack !== null && ack !== undefined) ack();
@@ -594,7 +595,7 @@ export class assign_workflow_node {
                 }
                 const currentinstance = res[0];
                 const state = res[0].state;
-                const _parentid = res[0].parentid;
+                const _parentid = res[0]._parentid;
                 if (_parentid !== null && _parentid !== undefined && _parentid !== "") {
                     const res2 = await NoderedUtil.Query({ collectionname: "workflow_instances", query: { "_id": _parentid }, top: 1, priority });
                     if (res2.length == 0) {
@@ -611,8 +612,14 @@ export class assign_workflow_node {
                     result.user = data.user;
                     this.node.send([null, result]);
                     if (ack !== null && ack !== undefined) ack();
-                    // await NoderedUtil.UpdateOne("workflow_instances", null, res[0], 1, false, null);
+                    await NoderedUtil.UpdateOne({ collectionname: "workflow_instances", query: { _id: _parentid }, item: { "$set": { "state": "completed" } } })
                     return;
+                } else {
+                    const res = await NoderedUtil.Query({ collectionname: "workflow_instances", query: { "_id": _id }, projection: { msg: 1 }, top: 1, jwt: data.jwt, priority });
+                    if (res.length > 0 && res[0].msg) {
+                        result = res[0].msg;
+                        result.state = data.state;
+                    }
                 }
             }
             result.payload = data.payload;
@@ -624,6 +631,30 @@ export class assign_workflow_node {
             NoderedUtil.HandleError(this, error, msg);
         }
     }
+    clone(obj: any) {
+        try {
+            var result = {};
+            var keys = Object.keys(obj);
+            keys.forEach(key => {
+                try {
+                    var val = obj[key];
+                    if (NoderedUtil.IsNullUndefinded(val)) {
+                        result[key] = val;
+                    } else if (Buffer.isBuffer(val)) {
+                    } else if (typeof (val) === "object") {
+                        result[key] = this.clone(val);
+                    } else {
+                        result[key] = val;
+                    }
+                } catch (error) {
+                    throw error;
+                }
+            });
+            return result;
+        } catch (error) {
+            throw error;
+        }
+    }
     async oninput(msg: any) {
         try {
             this.node.status({ fill: "blue", shape: "dot", text: "Processing" });
@@ -653,18 +684,26 @@ export class assign_workflow_node {
 
 
             msg.jwt = (await NoderedUtil.RenewToken({ jwt, longtoken: true })).jwt;
+            let cloned = this.clone(msg);
+
             const runnerinstance = new Base();
             runnerinstance._type = "instance";
             runnerinstance.name = "runner: " + name;
             (runnerinstance as any).queue = this.localqueue;
             (runnerinstance as any).state = "idle";
-            (runnerinstance as any).msg = msg;
+            (runnerinstance as any).msg = cloned;
             (runnerinstance as any).jwt = msg.jwt;
             const who = WebSocketClient.instance.user;
             Base.addRight(runnerinstance, who._id, who.name, [-1]);
 
+            const size = JSON.stringify(runnerinstance).length * 2; // 2B per character
+            if (size > (512 * 1024)) {
+                throw new Error("msg object is over 512KB in size, please clean up the msg object before using Assign");
+            }
+
             const res3 = await NoderedUtil.InsertOne({ collectionname: "workflow_instances", item: runnerinstance, jwt, priority });
             msg._parentid = res3._id;
+            msg.payload._parentid = res3._id;
 
             // parentid: res3._id, 
             msg.newinstanceid = await NoderedUtil.CreateWorkflowInstance({ targetid, workflowid, resultqueue: this.localqueue, data: msg.payload, initialrun, jwt, priority });
diff --git a/VERSION b/VERSION
index d0199d3e..144cbab5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.4.13
\ No newline at end of file
+1.4.14
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 39ccf34f..cc6c412d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,16 @@
 {
   "name": "@openiap/openflow",
-  "version": "1.4.13",
+  "version": "1.4.14",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@openiap/openflow",
-      "version": "1.4.13",
+      "version": "1.4.14",
       "license": "MPL-2.0",
       "dependencies": {
         "@kubernetes/client-node": "0.14.3",
-        "@openiap/openflow-api": "^2.0.11",
+        "@openiap/openflow-api": "^2.0.13",
         "@opentelemetry/api": "1.0.0-rc.3",
         "@opentelemetry/core": "0.19.0",
         "@opentelemetry/exporter-collector-grpc": "0.19.0",
@@ -46,7 +46,7 @@
         "mongodb": "^3.7.3",
         "morgan": "^1.10.0",
         "multer": "^1.4.2",
-        "multer-gridfs-storage": "^5.0.0",
+        "multer-gridfs-storage": "^5.0.2",
         "nodemailer": "^6.7.5",
         "nyc": "^15.1.0",
         "oauth2-server": "^3.1.1",
@@ -55,9 +55,10 @@
         "passport": "^0.4.1",
         "passport-google-oauth20": "^2.0.0",
         "passport-local": "^1.0.0",
+        "passport-openidconnect": "^0.1.1",
         "passport-saml": "^3.1.0",
         "passport-saml-metadata": "^2.4.1",
-        "pm2": "^5.1.0",
+        "pm2": "^5.2.0",
         "rate-limiter-flexible": "^2.2.2",
         "readline-sync": "^1.4.10",
         "request": "^2.88.2",
@@ -96,7 +97,7 @@
         "merge-stream": "^2.0.0",
         "mocha": "^9.1.3",
         "popper.js": "^1.16.1",
-        "sass": "^1.45.1",
+        "sass": "^1.52.2",
         "tinyify": "^3.0.0",
         "tsify": "^5.0.4",
         "typescript": "^4.3.4",
@@ -929,9 +930,9 @@
       }
     },
     "node_modules/@openiap/openflow-api": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/@openiap/openflow-api/-/openflow-api-2.0.11.tgz",
-      "integrity": "sha512-++2E3gSv07oIGkGU18SNlC0q4t2UpKH5mIdMx6WE9Yf6B2zE3d1zah5E+iVQqfdqRLV5WzxS1zCQJC1FBQr23Q==",
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/@openiap/openflow-api/-/openflow-api-2.0.13.tgz",
+      "integrity": "sha512-DE5833vUf061u4pUp+R3+zx5qKji9in/jhnlzXe9QNr1iH013CW1GEDGU3ZxlvFD3NEc68vdgVt/7PgMDfs/sw==",
       "dependencies": {
         "envfile": "^6.9.0",
         "fs-extra": "^9.0.1",
@@ -4475,13 +4476,10 @@
       "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
       "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="
     },
-    "node_modules/cron": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/cron/-/cron-1.8.2.tgz",
-      "integrity": "sha512-Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg==",
-      "dependencies": {
-        "moment-timezone": "^0.5.x"
-      }
+    "node_modules/croner": {
+      "version": "4.1.97",
+      "resolved": "https://registry.npmjs.org/croner/-/croner-4.1.97.tgz",
+      "integrity": "sha512-/f6gpQuxDaqXu+1kwQYSckUglPaOrHdbIlBAu0YuW8/Cdb45XwXYNUBXg3r/9Mo6n540Kn/smKcZWko5x99KrQ=="
     },
     "node_modules/cross-spawn": {
       "version": "6.0.5",
@@ -10305,17 +10303,6 @@
         "node": "*"
       }
     },
-    "node_modules/moment-timezone": {
-      "version": "0.5.34",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.34.tgz",
-      "integrity": "sha512-3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg==",
-      "dependencies": {
-        "moment": ">= 2.9.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/mongodb": {
       "version": "3.7.3",
       "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.7.3.tgz",
@@ -10425,9 +10412,9 @@
       }
     },
     "node_modules/multer-gridfs-storage": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/multer-gridfs-storage/-/multer-gridfs-storage-5.0.1.tgz",
-      "integrity": "sha512-1mdt+HYk+K9FQ8qXZG6nQ4zEeeaZ8ngqv179iaBJDxCnWz4zsxU90KdyYKRlqlDm0/p4jxO43mW8UDE1HlTLog==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/multer-gridfs-storage/-/multer-gridfs-storage-5.0.2.tgz",
+      "integrity": "sha512-oYl70i792uyJfgpvOfJrZIru4MsjjAueDHLZXTDGix/yPJuk1/lfqdPHHnv/XVVGfVZb4G9jJqwEFf9JIX1SOQ==",
       "dependencies": {
         "@types/express": "^4.17.6",
         "@types/mongodb": "^3.5.25",
@@ -11741,6 +11728,22 @@
         "node": ">= 0.4.0"
       }
     },
+    "node_modules/passport-openidconnect": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/passport-openidconnect/-/passport-openidconnect-0.1.1.tgz",
+      "integrity": "sha512-r0QJiWEzwCg2MeCIXVP5G6YxVRqnEsZ2HpgKRthZ9AiQHJrgGUytXpsdcGF9BRwd3yMrEesb/uG/Yxb86rrY0g==",
+      "dependencies": {
+        "oauth": "0.9.x",
+        "passport-strategy": "1.x.x"
+      },
+      "engines": {
+        "node": ">= 0.6.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/jaredhanson"
+      }
+    },
     "node_modules/passport-saml": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/passport-saml/-/passport-saml-3.1.2.tgz",
@@ -11971,6 +11974,7 @@
       "version": "2.0.21",
       "resolved": "https://registry.npmjs.org/pidusage/-/pidusage-2.0.21.tgz",
       "integrity": "sha512-cv3xAQos+pugVX+BfXpHsbyz/dLzX+lr44zNMsYiGxUw+kV5sgQCIcLd1z+0vq+KyC7dJ+/ts2PsfgWfSC3WXA==",
+      "optional": true,
       "dependencies": {
         "safe-buffer": "^5.2.1"
       },
@@ -12055,9 +12059,9 @@
       }
     },
     "node_modules/pm2": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/pm2/-/pm2-5.1.1.tgz",
-      "integrity": "sha512-2Agpn2IVXOKu8kP+qaxKOvMLNtbZ6lY4bzKcEW2d2tw7O0lpNO7QvDayY4af+8U1+WCn90UjPK4q2wPFVHt/sA==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/pm2/-/pm2-5.2.0.tgz",
+      "integrity": "sha512-PO5hMVhQ85cTszFM++6v07Me9hPJMkFbHjkFigtMMk+La8ty2wCi2dlBTeZYJDhPUSjK8Ccltpq2buNRcyMOTw==",
       "dependencies": {
         "@pm2/agent": "~2.0.0",
         "@pm2/io": "~5.0.0",
@@ -12069,7 +12073,7 @@
         "chokidar": "^3.5.1",
         "cli-tableau": "^2.0.0",
         "commander": "2.15.1",
-        "cron": "1.8.2",
+        "croner": "~4.1.92",
         "dayjs": "~1.8.25",
         "debug": "^4.3.1",
         "enquirer": "2.3.6",
@@ -12077,7 +12081,7 @@
         "fclone": "1.0.11",
         "mkdirp": "1.0.4",
         "needle": "2.4.0",
-        "pidusage": "2.0.21",
+        "pidusage": "~3.0",
         "pm2-axon": "~4.0.1",
         "pm2-axon-rpc": "~0.7.1",
         "pm2-deploy": "~1.0.2",
@@ -12312,6 +12316,17 @@
         "node": ">=8"
       }
     },
+    "node_modules/pm2/node_modules/pidusage": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pidusage/-/pidusage-3.0.0.tgz",
+      "integrity": "sha512-8VJLToXhj+RYZGNVw8oxc7dS54iCQXUJ+MDFHezQ/fwF5B8W4OWodAMboc1wb08S/4LiHwAmkT4ohf/d3YPPsw==",
+      "dependencies": {
+        "safe-buffer": "^5.2.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/pm2/node_modules/readdirp": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -13547,9 +13562,9 @@
       }
     },
     "node_modules/sass": {
-      "version": "1.45.1",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.45.1.tgz",
-      "integrity": "sha512-pwPRiq29UR0o4X3fiQyCtrESldXvUQAAE0QmcJTpsI4kuHHcLzZ54M1oNBVIXybQv8QF2zfkpFcTxp8ta97dUA==",
+      "version": "1.52.2",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.52.2.tgz",
+      "integrity": "sha512-mfHB2VSeFS7sZlPv9YohB9GB7yWIgQNTGniQwfQ04EoQN0wsQEv7SwpCwy/x48Af+Z3vDeFXz+iuXM3HK/phZQ==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -13560,7 +13575,7 @@
         "sass": "sass.js"
       },
       "engines": {
-        "node": ">=8.9.0"
+        "node": ">=12.0.0"
       }
     },
     "node_modules/sass/node_modules/anymatch": {
@@ -17128,9 +17143,9 @@
       }
     },
     "@openiap/openflow-api": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/@openiap/openflow-api/-/openflow-api-2.0.11.tgz",
-      "integrity": "sha512-++2E3gSv07oIGkGU18SNlC0q4t2UpKH5mIdMx6WE9Yf6B2zE3d1zah5E+iVQqfdqRLV5WzxS1zCQJC1FBQr23Q==",
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/@openiap/openflow-api/-/openflow-api-2.0.13.tgz",
+      "integrity": "sha512-DE5833vUf061u4pUp+R3+zx5qKji9in/jhnlzXe9QNr1iH013CW1GEDGU3ZxlvFD3NEc68vdgVt/7PgMDfs/sw==",
       "requires": {
         "envfile": "^6.9.0",
         "fs-extra": "^9.0.1",
@@ -20151,13 +20166,10 @@
       "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
       "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="
     },
-    "cron": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/cron/-/cron-1.8.2.tgz",
-      "integrity": "sha512-Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg==",
-      "requires": {
-        "moment-timezone": "^0.5.x"
-      }
+    "croner": {
+      "version": "4.1.97",
+      "resolved": "https://registry.npmjs.org/croner/-/croner-4.1.97.tgz",
+      "integrity": "sha512-/f6gpQuxDaqXu+1kwQYSckUglPaOrHdbIlBAu0YuW8/Cdb45XwXYNUBXg3r/9Mo6n540Kn/smKcZWko5x99KrQ=="
     },
     "cross-spawn": {
       "version": "6.0.5",
@@ -24851,14 +24863,6 @@
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.3.tgz",
       "integrity": "sha1-vbmdJw1tf9p4zA+6zoVeJ/59pp8="
     },
-    "moment-timezone": {
-      "version": "0.5.34",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.34.tgz",
-      "integrity": "sha512-3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg==",
-      "requires": {
-        "moment": ">= 2.9.0"
-      }
-    },
     "mongodb": {
       "version": "3.7.3",
       "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.7.3.tgz",
@@ -24942,9 +24946,9 @@
       }
     },
     "multer-gridfs-storage": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/multer-gridfs-storage/-/multer-gridfs-storage-5.0.1.tgz",
-      "integrity": "sha512-1mdt+HYk+K9FQ8qXZG6nQ4zEeeaZ8ngqv179iaBJDxCnWz4zsxU90KdyYKRlqlDm0/p4jxO43mW8UDE1HlTLog==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/multer-gridfs-storage/-/multer-gridfs-storage-5.0.2.tgz",
+      "integrity": "sha512-oYl70i792uyJfgpvOfJrZIru4MsjjAueDHLZXTDGix/yPJuk1/lfqdPHHnv/XVVGfVZb4G9jJqwEFf9JIX1SOQ==",
       "requires": {
         "@types/express": "^4.17.6",
         "@types/mongodb": "^3.5.25",
@@ -25978,6 +25982,15 @@
         "utils-merge": "1.x.x"
       }
     },
+    "passport-openidconnect": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/passport-openidconnect/-/passport-openidconnect-0.1.1.tgz",
+      "integrity": "sha512-r0QJiWEzwCg2MeCIXVP5G6YxVRqnEsZ2HpgKRthZ9AiQHJrgGUytXpsdcGF9BRwd3yMrEesb/uG/Yxb86rrY0g==",
+      "requires": {
+        "oauth": "0.9.x",
+        "passport-strategy": "1.x.x"
+      }
+    },
     "passport-saml": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/passport-saml/-/passport-saml-3.1.2.tgz",
@@ -26164,6 +26177,7 @@
       "version": "2.0.21",
       "resolved": "https://registry.npmjs.org/pidusage/-/pidusage-2.0.21.tgz",
       "integrity": "sha512-cv3xAQos+pugVX+BfXpHsbyz/dLzX+lr44zNMsYiGxUw+kV5sgQCIcLd1z+0vq+KyC7dJ+/ts2PsfgWfSC3WXA==",
+      "optional": true,
       "requires": {
         "safe-buffer": "^5.2.1"
       }
@@ -26226,9 +26240,9 @@
       }
     },
     "pm2": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/pm2/-/pm2-5.1.1.tgz",
-      "integrity": "sha512-2Agpn2IVXOKu8kP+qaxKOvMLNtbZ6lY4bzKcEW2d2tw7O0lpNO7QvDayY4af+8U1+WCn90UjPK4q2wPFVHt/sA==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/pm2/-/pm2-5.2.0.tgz",
+      "integrity": "sha512-PO5hMVhQ85cTszFM++6v07Me9hPJMkFbHjkFigtMMk+La8ty2wCi2dlBTeZYJDhPUSjK8Ccltpq2buNRcyMOTw==",
       "requires": {
         "@pm2/agent": "~2.0.0",
         "@pm2/io": "~5.0.0",
@@ -26240,7 +26254,7 @@
         "chokidar": "^3.5.1",
         "cli-tableau": "^2.0.0",
         "commander": "2.15.1",
-        "cron": "1.8.2",
+        "croner": "~4.1.92",
         "dayjs": "~1.8.25",
         "debug": "^4.3.1",
         "enquirer": "2.3.6",
@@ -26248,7 +26262,7 @@
         "fclone": "1.0.11",
         "mkdirp": "1.0.4",
         "needle": "2.4.0",
-        "pidusage": "2.0.21",
+        "pidusage": "~3.0",
         "pm2-axon": "~4.0.1",
         "pm2-axon-rpc": "~0.7.1",
         "pm2-deploy": "~1.0.2",
@@ -26358,6 +26372,14 @@
             "binary-extensions": "^2.0.0"
           }
         },
+        "pidusage": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pidusage/-/pidusage-3.0.0.tgz",
+          "integrity": "sha512-8VJLToXhj+RYZGNVw8oxc7dS54iCQXUJ+MDFHezQ/fwF5B8W4OWodAMboc1wb08S/4LiHwAmkT4ohf/d3YPPsw==",
+          "requires": {
+            "safe-buffer": "^5.2.1"
+          }
+        },
         "readdirp": {
           "version": "3.6.0",
           "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -27441,9 +27463,9 @@
       }
     },
     "sass": {
-      "version": "1.45.1",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.45.1.tgz",
-      "integrity": "sha512-pwPRiq29UR0o4X3fiQyCtrESldXvUQAAE0QmcJTpsI4kuHHcLzZ54M1oNBVIXybQv8QF2zfkpFcTxp8ta97dUA==",
+      "version": "1.52.2",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.52.2.tgz",
+      "integrity": "sha512-mfHB2VSeFS7sZlPv9YohB9GB7yWIgQNTGniQwfQ04EoQN0wsQEv7SwpCwy/x48Af+Z3vDeFXz+iuXM3HK/phZQ==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
diff --git a/package.json b/package.json
index 56bddc7e..0927181c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openiap/openflow",
-  "version": "1.4.13",
+  "version": "1.4.14",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@kubernetes/client-node": "0.14.3",
-    "@openiap/openflow-api": "^2.0.11",
+    "@openiap/openflow-api": "^2.0.13",
     "@opentelemetry/api": "1.0.0-rc.3",
     "@opentelemetry/core": "0.19.0",
     "@opentelemetry/exporter-collector-grpc": "0.19.0",
@@ -68,7 +68,7 @@
     "mongodb": "^3.7.3",
     "morgan": "^1.10.0",
     "multer": "^1.4.2",
-    "multer-gridfs-storage": "^5.0.0",
+    "multer-gridfs-storage": "^5.0.2",
     "nodemailer": "^6.7.5",
     "nyc": "^15.1.0",
     "oauth2-server": "^3.1.1",
@@ -77,9 +77,10 @@
     "passport": "^0.4.1",
     "passport-google-oauth20": "^2.0.0",
     "passport-local": "^1.0.0",
+    "passport-openidconnect": "^0.1.1",
     "passport-saml": "^3.1.0",
     "passport-saml-metadata": "^2.4.1",
-    "pm2": "^5.1.0",
+    "pm2": "^5.2.0",
     "rate-limiter-flexible": "^2.2.2",
     "readline-sync": "^1.4.10",
     "request": "^2.88.2",
@@ -114,7 +115,7 @@
     "merge-stream": "^2.0.0",
     "mocha": "^9.1.3",
     "popper.js": "^1.16.1",
-    "sass": "^1.45.1",
+    "sass": "^1.52.2",
     "tinyify": "^3.0.0",
     "tsify": "^5.0.4",
     "typescript": "^4.3.4",
diff --git a/test/DBHelper.test.ts b/test/DBHelper.test.ts
index 5cf074ce..813d931d 100644
--- a/test/DBHelper.test.ts
+++ b/test/DBHelper.test.ts
@@ -6,7 +6,7 @@ import { Config } from "../OpenFlow/src/Config";
 import { DatabaseConnection } from '../OpenFlow/src/DatabaseConnection';
 import assert = require('assert');
 import { Logger } from '../OpenFlow/src/Logger';
-import { NoderedUtil, TokenUser, User, WellknownIds } from '@openiap/openflow-api';
+import { FederationId, NoderedUtil, TokenUser, User, WellknownIds } from '@openiap/openflow-api';
 import { Crypt } from '../OpenFlow/src/Crypt';
 
 @suite class dbhelper_test {
@@ -47,25 +47,12 @@ import { Crypt } from '../OpenFlow/src/Crypt';
         assert.strictEqual(user, null, "Returned user with null as id")
         // await assert.rejects(DBHelper.FindById(null, this.rootToken, null));
     }
-    @test async 'FindByUsernameOrId'() {
-        var user = await Logger.DBHelper.FindByUsernameOrId(this.testUser.username, null, null);
-        assert.notStrictEqual(user, null, "Failed locating user by username")
-        user = await Logger.DBHelper.FindByUsernameOrId(null, this.testUser._id, null);
-        assert.notStrictEqual(user, null, "Failed locating user by userid")
-        user = await Logger.DBHelper.FindByUsernameOrId("does not exist", null, null);
-        assert.strictEqual(user, null, "returned something with illegal username")
-        user = await Logger.DBHelper.FindByUsernameOrId(null, "does not exist", null);
-        assert.strictEqual(user, null, "returned something with illegal id")
-        user = await Logger.DBHelper.FindByUsernameOrId(null, null, null)
-        assert.strictEqual(user, null, "Returned user with null as id and username")
-        // await assert.rejects(DBHelper.FindByUsernameOrId(null, null, null));
-    }
     @test async 'FindByUsernameOrFederationid'() {
-        var user = await Logger.DBHelper.FindByUsernameOrFederationid(this.testUser.username, null);
+        var user = await Logger.DBHelper.FindByUsernameOrFederationid(this.testUser.username, null, null);
         assert.notStrictEqual(user, null, "Failed locating user by username")
-        user = await Logger.DBHelper.FindByUsernameOrFederationid("test@federation.id", null);
+        user = await Logger.DBHelper.FindByUsernameOrFederationid("test@federation.id", 'google', null);
         assert.notStrictEqual(user, null, "Failed locating user by federation id")
-        user = await Logger.DBHelper.FindByUsernameOrFederationid(null, null)
+        user = await Logger.DBHelper.FindByUsernameOrFederationid(null, null, null)
         assert.strictEqual(user, null, "Returned user with null as username and Federationid")
         // await assert.rejects(DBHelper.FindByUsernameOrFederationid(null, null));
     }
@@ -83,19 +70,19 @@ import { Crypt } from '../OpenFlow/src/Crypt';
         // await assert.rejects(DBHelper.DecorateWithRoles(null, null));
     }
     @test async 'FindRoleByName'() {
-        var role = await Logger.DBHelper.FindRoleByName(this.testUser.username, null);
+        var role = await Logger.DBHelper.FindRoleByName(this.testUser.username, null, null);
         assert.strictEqual(role, null, "returned something with illegal name")
-        role = await Logger.DBHelper.FindRoleByName("users", null);
+        role = await Logger.DBHelper.FindRoleByName("users", null, null);
         assert.notStrictEqual(role, null, "Failed locating role users")
     }
     @test async 'FindRoleByNameOrId'() {
-        var role = await Logger.DBHelper.FindRoleByName(this.testUser.username, null);
+        var role = await Logger.DBHelper.FindRoleByName(this.testUser.username, null, null);
         assert.strictEqual(role, null, "returned something with illegal name")
-        role = await Logger.DBHelper.FindRoleByName("users", null);
+        role = await Logger.DBHelper.FindRoleByName("users", null, null);
         assert.notStrictEqual(role, null, "Failed locating role users")
         role = await Logger.DBHelper.FindRoleById(WellknownIds.users, null, null);
         assert.notStrictEqual(role, null, "Failed locating role users")
-        role = await Logger.DBHelper.FindRoleByName(null, null);
+        role = await Logger.DBHelper.FindRoleByName(null, null, null);
         assert.strictEqual(role, null, "Returned role with null as username")
         role = await Logger.DBHelper.FindRoleById(null, null, null);
         assert.strictEqual(role, null, "Returned userrole with null as id")
@@ -106,7 +93,13 @@ import { Crypt } from '../OpenFlow/src/Crypt';
     @timeout(5000)
     @test async 'EnsureUser'() {
         var name = "dummytestuser" + NoderedUtil.GetUniqueIdentifier();
-        var dummyuser: User = await Logger.DBHelper.EnsureUser(this.rootToken, name, name, null, "RandomPassword", null);
+        let extraoptions = {
+            federationids: [new FederationId("test@federation.id", 'google')],
+            emailvalidated: true,
+            formvalidated: true,
+            validated: true
+        }
+        var dummyuser: User = await Logger.DBHelper.EnsureUser(this.rootToken, name, name, null, "RandomPassword", extraoptions, null);
         var result = await Crypt.ValidatePassword(dummyuser, "RandomPassword", null);
 
         await Logger.DBHelper.EnsureNoderedRoles(dummyuser, this.rootToken, true, null);
@@ -119,7 +112,7 @@ import { Crypt } from '../OpenFlow/src/Crypt';
         assert.ok(result, "Failed validating with the correct password");
         await Config.db.DeleteOne(dummyuser._id, "users", this.rootToken, null);
 
-        await assert.rejects(Logger.DBHelper.EnsureUser(this.rootToken, null, null, null, null, null));
+        await assert.rejects(Logger.DBHelper.EnsureUser(this.rootToken, null, null, null, null, null, null));
     }
     @test async 'EnsureRole'() {
         var name = "dummytestrole" + NoderedUtil.GetUniqueIdentifier();
diff --git a/test/basic_entities.test.ts b/test/basic_entities.test.ts
index 60a5ff80..48a20316 100644
--- a/test/basic_entities.test.ts
+++ b/test/basic_entities.test.ts
@@ -18,8 +18,13 @@ import { Logger } from '../OpenFlow/src/Logger';
         if (!this.socket) this.socket = new WebSocketClient(null, "wss://pc.openiap.io", true);
         // if (!this.socket) this.socket = new WebSocketClient(null, "wss://demo.openiap.io", true, true);
         this.socket.agent = "test-cli";
-        await this.socket.Connect();
-        await NoderedUtil.SigninWithUsername({ username: "testuser", password: "testuser" });
+        try {
+            await this.socket.Connect();
+            await NoderedUtil.SigninWithUsername({ username: "testuser", password: "testuser" });
+        } catch (error) {
+            console.error(error);
+            throw error;
+        }
     }
     @timeout(5000)
     async after() {