diff --git a/packages/common/e2e/hub-groups.e2e.ts b/packages/common/e2e/hub-groups.e2e.ts
index b65bba6b7bd..804c0cb03fe 100644
--- a/packages/common/e2e/hub-groups.e2e.ts
+++ b/packages/common/e2e/hub-groups.e2e.ts
@@ -32,7 +32,7 @@ describe("Hub Groups", () => {
       expect(newGroup.membershipAccess).toBe("organization");
       const fetchedGroup = await fetchHubGroup(
         newGroup.id,
-        ctxMgr.context.userRequestOptions
+        ctxMgr.context.hubRequestOptions
       );
       // verify can* flags
       expect(fetchedGroup.canDelete).toBe(true);
@@ -51,7 +51,7 @@ describe("Hub Groups", () => {
       expect(updatedGroup.membershipAccess).toBe("anyone");
       await deleteHubGroup(newGroup.id, ctxMgr.context.userRequestOptions);
       try {
-        await fetchHubGroup(newGroup.id, ctxMgr.context.userRequestOptions);
+        await fetchHubGroup(newGroup.id, ctxMgr.context.hubRequestOptions);
         fail("should have thrown error");
       } catch (e) {
         expect((e as any).message).toBe(
diff --git a/packages/common/src/core/fetchHubEntity.ts b/packages/common/src/core/fetchHubEntity.ts
index b63b1e8c09c..b6b1af02f10 100644
--- a/packages/common/src/core/fetchHubEntity.ts
+++ b/packages/common/src/core/fetchHubEntity.ts
@@ -49,7 +49,7 @@ export async function fetchHubEntity(
       result = await fetchTemplate(identifier, context.requestOptions);
       break;
     case "group":
-      result = await fetchHubGroup(identifier, context.userRequestOptions);
+      result = await fetchHubGroup(identifier, context.hubRequestOptions);
       break;
     case "survey":
       result = await fetchSurvey(identifier, context.hubRequestOptions);
diff --git a/packages/common/src/groups/HubGroup.ts b/packages/common/src/groups/HubGroup.ts
index 1129a71ca59..8c3eb94763b 100644
--- a/packages/common/src/groups/HubGroup.ts
+++ b/packages/common/src/groups/HubGroup.ts
@@ -121,7 +121,7 @@ export class HubGroup
     context: IArcGISContext
   ): Promise<HubGroup> {
     try {
-      const group = await fetchHubGroup(identifier, context.userRequestOptions);
+      const group = await fetchHubGroup(identifier, context.hubRequestOptions);
       // create an instance of HubGroup from the group
       return HubGroup.fromJson(group, context);
     } catch (ex) {
diff --git a/packages/common/src/groups/HubGroups.ts b/packages/common/src/groups/HubGroups.ts
index 37faf6451d7..6cbf2636544 100644
--- a/packages/common/src/groups/HubGroups.ts
+++ b/packages/common/src/groups/HubGroups.ts
@@ -142,7 +142,7 @@ export async function createHubGroup(
  */
 export async function fetchHubGroup(
   identifier: string,
-  requestOptions: IUserRequestOptions
+  requestOptions: IHubRequestOptions
 ): Promise<IHubGroup> {
   const group = await getGroup(identifier, requestOptions);
   return convertGroupToHubGroup(group, requestOptions);
diff --git a/packages/common/src/groups/_internal/convertGroupToHubGroup.ts b/packages/common/src/groups/_internal/convertGroupToHubGroup.ts
index 35aa0cfc662..5a19afe6205 100644
--- a/packages/common/src/groups/_internal/convertGroupToHubGroup.ts
+++ b/packages/common/src/groups/_internal/convertGroupToHubGroup.ts
@@ -3,7 +3,7 @@ import { PropertyMapper } from "../../core/_internal/PropertyMapper";
 import { IHubGroup } from "../../core/types/IHubGroup";
 import { computeProps } from "./computeProps";
 import { getPropertyMap } from "./getPropertyMap";
-import { IUserRequestOptions } from "@esri/arcgis-rest-auth";
+import { IHubRequestOptions } from "../../types";
 
 /**
  * Convert an IGroup to a Hub Group
@@ -13,7 +13,7 @@ import { IUserRequestOptions } from "@esri/arcgis-rest-auth";
 
 export function convertGroupToHubGroup(
   group: IGroup,
-  requestOptions: IUserRequestOptions
+  requestOptions: IHubRequestOptions
 ): IHubGroup {
   const mapper = new PropertyMapper<Partial<IHubGroup>, IGroup>(
     getPropertyMap()
diff --git a/packages/common/src/permissions/HubPermissionPolicies.ts b/packages/common/src/permissions/HubPermissionPolicies.ts
index d081935b98f..8ee3fab957c 100644
--- a/packages/common/src/permissions/HubPermissionPolicies.ts
+++ b/packages/common/src/permissions/HubPermissionPolicies.ts
@@ -121,7 +121,7 @@ const SystemPermissionPolicies: IPermissionPolicy[] = [
     permission: "hub:card:follow",
     environments: ["qaext"],
     availability: ["flag"],
-    licenses: ["hub-premium"],
+    licenses: ["hub-basic", "hub-premium"],
   },
   {
     // When enabled, the edit & manage links will take the user to umbrella
diff --git a/packages/common/test/core/fetchHubEntity.test.ts b/packages/common/test/core/fetchHubEntity.test.ts
index 802ad306e0a..dcac22ead78 100644
--- a/packages/common/test/core/fetchHubEntity.test.ts
+++ b/packages/common/test/core/fetchHubEntity.test.ts
@@ -87,7 +87,7 @@ describe("fetchHubEntity:", () => {
   });
   it("fetches group", async () => {
     const ctx = {
-      userRequestOptions: "fakeRequestOptions",
+      hubRequestOptions: "fakeRequestOptions",
     } as unknown as IArcGISContext;
     const spy = spyOn(
       require("../../src/groups/HubGroups"),