diff --git a/frontend/src/HomePage/AppList.jsx b/frontend/src/HomePage/AppList.jsx
index cea0156f19..593f4c8901 100644
--- a/frontend/src/HomePage/AppList.jsx
+++ b/frontend/src/HomePage/AppList.jsx
@@ -48,7 +48,7 @@ const AppList = (props) => {
           </div>
         </div>
       )}
-      {!props.isLoading && props.apps?.length === 0 && (
+      {!props.isLoading && (props.apps?.length === 0 || props.currentFolder?.count == 0) && (
         <div className="text-center d-block">
           <EmptyFoldersIllustration className="mb-4" data-cy="empty-folder-image" />
           <span
diff --git a/server/src/modules/user_resource_permissions/utility/group-permissions.utility.ts b/server/src/modules/user_resource_permissions/utility/group-permissions.utility.ts
index d8775aeab5..01047c9d2a 100644
--- a/server/src/modules/user_resource_permissions/utility/group-permissions.utility.ts
+++ b/server/src/modules/user_resource_permissions/utility/group-permissions.utility.ts
@@ -99,7 +99,8 @@ export function validateUpdateGroupOperation(
   ) {
     throw new MethodNotAllowedException(ERROR_HANDLER.DEFAULT_GROUP_NAME_UPDATE);
   }
-
+  const humanizeList = ['End-user', 'Builder', 'Admin'];
+  if (humanizeList.includes(newName)) throw new BadRequestException(ERROR_HANDLER.DEFAULT_GROUP_NAME);
   if ([USER_ROLE.ADMIN, USER_ROLE.END_USER].includes(name as USER_ROLE)) {
     throw new MethodNotAllowedException(ERROR_HANDLER.NON_EDITABLE_GROUP_UPDATE);
   }