diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index be236f11..e2bd35ba 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -1967,7 +1967,7 @@ export class ProfileController extends Controller {
       process.env.AUTH_ACCOUNT_SECRET,
       { expiresIn: "15m" },
     );
-    const link = process.env.URL + "/verifyemail?upn=" + token;
+    const link = process.env.VITE_URL_USER + "/verifyemail?upn=" + token;
 
     await new CallAPI()
       .PostData(req, "/placement/noti/send-mail", {
@@ -4136,7 +4136,14 @@ export class ProfileController extends Controller {
       .leftJoinAndSelect("current_holders.orgChild2", "orgChild2")
       .leftJoinAndSelect("current_holders.orgChild3", "orgChild3")
       .leftJoinAndSelect("current_holders.orgChild4", "orgChild4")
-      .where("current_holders.orgRevisionId = :orgRevisionId", { orgRevisionId: findRevision.id })
+      .where(
+        node && nodeId
+          ? "current_holders.orgRevisionId = :orgRevisionId" 
+          : "1=1", 
+        { 
+          orgRevisionId: node && nodeId ? findRevision.id : undefined,
+        }
+      )
       .andWhere(
         _data.root != undefined && _data.root != null
           ? _data.root[0] != null
@@ -4863,7 +4870,7 @@ export class ProfileController extends Controller {
       node: null,
       nodeId: null,
       salary: profile ? profile.amount : null,
-      amountSpecial: profile ? profile.amountSpecial : null
+      amountSpecial: profile ? profile.amountSpecial : null,
     };
 
     if (_profile.child4Id != null) {
diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts
index dff5fe59..760c0c1f 100644
--- a/src/controllers/ProfileEmployeeController.ts
+++ b/src/controllers/ProfileEmployeeController.ts
@@ -1454,7 +1454,14 @@ export class ProfileEmployeeController extends Controller {
       .leftJoinAndSelect("current_holders.orgChild2", "orgChild2")
       .leftJoinAndSelect("current_holders.orgChild3", "orgChild3")
       .leftJoinAndSelect("current_holders.orgChild4", "orgChild4")
-      .where("current_holders.orgRevisionId = :orgRevisionId", { orgRevisionId: findRevision.id })
+      .where(
+        node && nodeId
+          ? "current_holders.orgRevisionId = :orgRevisionId" 
+          : "1=1", 
+        { 
+          orgRevisionId: node && nodeId ? findRevision.id : undefined,
+        }
+      )
       .andWhere(
         _data.root != undefined && _data.root != null
           ? _data.root[0] != null