diff --git a/backend-pg/src/ee/routes/v1/license-router.ts b/backend-pg/src/ee/routes/v1/license-router.ts
index c2b9f96d3..675dcdc00 100644
--- a/backend-pg/src/ee/routes/v1/license-router.ts
+++ b/backend-pg/src/ee/routes/v1/license-router.ts
@@ -32,17 +32,17 @@ export const registerLicenseRouter = async (server: FastifyZodProvider) => {
     schema: {
       params: z.object({ organizationId: z.string().trim() }),
       response: {
-        200: z.any()
+        200: z.object({ plan: z.any() })
       }
     },
     onRequest: verifyAuth([AuthMode.JWT]),
     handler: async (req) => {
-      const data = await server.services.license.getOrgPlan({
+      const plan = await server.services.license.getOrgPlan({
         actorId: req.permission.id,
         actor: req.permission.type,
         orgId: req.params.organizationId
       });
-      return data;
+      return { plan };
     }
   });
 
diff --git a/backend-pg/src/server/routes/index.ts b/backend-pg/src/server/routes/index.ts
index d7a5f1e98..b5d14c40f 100644
--- a/backend-pg/src/server/routes/index.ts
+++ b/backend-pg/src/server/routes/index.ts
@@ -288,7 +288,8 @@ export const registerRoutes = async (
     permissionService,
     projectEnvDal,
     licenseService,
-    projectDal
+    projectDal,
+    folderDal
   });
   const projectKeyService = projectKeyServiceFactory({
     permissionService,
diff --git a/backend-pg/src/server/routes/v1/password-router.ts b/backend-pg/src/server/routes/v1/password-router.ts
index c9643ebdf..ae1a36117 100644
--- a/backend-pg/src/server/routes/v1/password-router.ts
+++ b/backend-pg/src/server/routes/v1/password-router.ts
@@ -121,7 +121,7 @@ export const registerPasswordRouter = async (server: FastifyZodProvider) => {
 
   server.route({
     method: "POST",
-    url: "/password-reset",
+    url: "/email/password-reset",
     onRequest: verifyAuth([AuthMode.JWT]),
     schema: {
       body: z.object({
diff --git a/backend-pg/src/services/project-env/project-env-service.ts b/backend-pg/src/services/project-env/project-env-service.ts
index b44ebc8d5..0781b3eef 100644
--- a/backend-pg/src/services/project-env/project-env-service.ts
+++ b/backend-pg/src/services/project-env/project-env-service.ts
@@ -11,9 +11,11 @@ import { BadRequestError } from "@app/lib/errors";
 import { TProjectDalFactory } from "../project/project-dal";
 import { TProjectEnvDalFactory } from "./project-env-dal";
 import { TCreateEnvDTO, TDeleteEnvDTO, TUpdateEnvDTO } from "./project-env-types";
+import { TSecretFolderDalFactory } from "../secret-folder/secret-folder-dal";
 
 type TProjectEnvServiceFactoryDep = {
   projectEnvDal: TProjectEnvDalFactory;
+  folderDal: Pick<TSecretFolderDalFactory, "create">;
   projectDal: Pick<TProjectDalFactory, "findById">;
   permissionService: Pick<TPermissionServiceFactory, "getProjectPermission">;
   licenseService: Pick<TLicenseServiceFactory, "getPlan">;
@@ -25,7 +27,8 @@ export const projectEnvServiceFactory = ({
   projectEnvDal,
   permissionService,
   licenseService,
-  projectDal
+  projectDal,
+  folderDal
 }: TProjectEnvServiceFactoryDep) => {
   const createEnvironment = async ({ projectId, actorId, actor, name, slug }: TCreateEnvDTO) => {
     const { permission } = await permissionService.getProjectPermission(actor, actorId, projectId);
@@ -56,6 +59,7 @@ export const projectEnvServiceFactory = ({
     const env = await projectEnvDal.transaction(async (tx) => {
       const lastPos = await projectEnvDal.findLastEnvPosition(projectId, tx);
       const doc = await projectEnvDal.create({ slug, name, projectId, position: lastPos + 1 }, tx);
+      await folderDal.create({ name: "root", parentId: null, envId: doc.id, version: 1 }, tx);
       return doc;
     });
     return env;
diff --git a/backend-pg/src/services/project/project-dal.ts b/backend-pg/src/services/project/project-dal.ts
index 888eae582..a3b1cab75 100644
--- a/backend-pg/src/services/project/project-dal.ts
+++ b/backend-pg/src/services/project/project-dal.ts
@@ -17,7 +17,7 @@ export const projectDalFactory = (db: TDbClient) => {
           `${TableName.ProjectMembership}.projectId`,
           `${TableName.Project}.id`
         )
-        .join(
+        .leftJoin(
           TableName.Environment,
           `${TableName.Environment}.projectId`,
           `${TableName.Project}.id`
diff --git a/frontend/src/hooks/api/users/queries.tsx b/frontend/src/hooks/api/users/queries.tsx
index 5c0349be1..3d5e80d74 100644
--- a/frontend/src/hooks/api/users/queries.tsx
+++ b/frontend/src/hooks/api/users/queries.tsx
@@ -70,7 +70,7 @@ export const fetchUserAction = async (action: string) => {
       action
     }
   });
-  return data.userAction;
+  return data.userAction || "";
 };
 
 export const useRenameUser = () => {
diff --git a/frontend/src/views/SecretMainPage/components/SecretListView/SecretDetaiSidebar.tsx b/frontend/src/views/SecretMainPage/components/SecretListView/SecretDetaiSidebar.tsx
index fcbb91b5d..a86a6b096 100644
--- a/frontend/src/views/SecretMainPage/components/SecretListView/SecretDetaiSidebar.tsx
+++ b/frontend/src/views/SecretMainPage/components/SecretListView/SecretDetaiSidebar.tsx
@@ -294,7 +294,7 @@ export const SecretDetailSidebar = ({
                       a={ProjectPermissionSub.Tags}
                     >
                       {(isAllowed) => (
-                        <DropdownMenuItem>
+                        <DropdownMenuItem asChild>
                           <Button
                             size="xs"
                             className="w-full"