diff --git a/education/windows/TOC.yml b/education/windows/TOC.yml
index 20a9db149a..072e3496fa 100644
--- a/education/windows/TOC.yml
+++ b/education/windows/TOC.yml
@@ -39,7 +39,7 @@ items:
     - name: Configure Take a Test in kiosk mode
       href: edu-take-a-test-kiosk-mode.md
     - name: Configure Shared PC
-      href: /windows/configuration/set-up-shared-or-guest-pc?context=/education/context/context.json
+      href: /windows/configuration/set-up-shared-or-guest-pc?context=/education/context/context
     - name: Use the Set up School PCs app
       href: use-set-up-school-pcs-app.md
     - name: Change Windows edition
@@ -99,6 +99,6 @@ items:
     - name: Take a Test technical reference
       href: take-a-test-app-technical.md
     - name: Shared PC technical reference
-      href: /windows/configuration/shared-pc-technical?context=/education/context/context.json
+      href: /windows/configuration/shared-pc-technical?context=/education/context/context
 
       
diff --git a/education/windows/index.yml b/education/windows/index.yml
index aa009435f9..8cf1e59688 100644
--- a/education/windows/index.yml
+++ b/education/windows/index.yml
@@ -86,7 +86,7 @@ landingContent:
         - text: Take tests and assessments in Windows
           url: take-tests-in-windows.md
         - text: Considerations for shared and guest devices
-          url: /windows/configuration/shared-devices-concepts?context=/education/context/context.json
+          url: /windows/configuration/shared-devices-concepts?context=/education/context/context
         - text: Change Windows editions
           url: change-home-to-edu.md
       - linkListType: how-to-guide
@@ -94,6 +94,6 @@ landingContent:
         - text: Configure Take a Test in kiosk mode
           url: edu-take-a-test-kiosk-mode.md
         - text: Configure Shared PC
-          url: /windows/configuration/set-up-shared-or-guest-pc?context=/education/context/context.json
+          url: /windows/configuration/set-up-shared-or-guest-pc?context=/education/context/context
         - text: "Deploy Minecraft: Education Edition"
           url: get-minecraft-for-education.md
\ No newline at end of file
diff --git a/windows/configuration/set-up-shared-or-guest-pc.md b/windows/configuration/set-up-shared-or-guest-pc.md
index 33e4c04dea..f1c2dad81a 100644
--- a/windows/configuration/set-up-shared-or-guest-pc.md
+++ b/windows/configuration/set-up-shared-or-guest-pc.md
@@ -24,7 +24,7 @@ The customizations offered by Shared PC are listed in the following table.
 
 | Area Name | Setting name and description|
 |---|---|
-|Shared PC mode | **EnableSharedPCMode** or **EnableSharedPCModeWithOneDriveSync**: when enabled, **Shared PC mode** is turned on and different settings are configured in the local GPO. For a detailed list of settings enabled by Shared PC Mode, see the [Shared PC technical reference](shared-pc-technical.md#setedupolicy#enablesharedpcmode-and-enablesharedpcmodewithonedrivesync).</li><li>This setting controls the API: [IsEnabled](/uwp/api/windows.system.profile.sharedmodesettings)</li>|
+|Shared PC mode | **EnableSharedPCMode** or **EnableSharedPCModeWithOneDriveSync**: when enabled, **Shared PC mode** is turned on and different settings are configured in the local GPO. For a detailed list of settings enabled by Shared PC Mode, see the [Shared PC technical reference](shared-pc-technical.md#enablesharedpcmode-and-enablesharedpcmodewithonedrivesync).</li><li>This setting controls the API: [IsEnabled](/uwp/api/windows.system.profile.sharedmodesettings)</li>|
 | Education policies | **SetEduPolicies**: when enabled, specific settings designed for Education devices are configured in the local GPO.<li>For a detailed list of settings enabled SetEduPolicies, see [Shared PC technical reference](shared-pc-technical.md#setedupolicy)</li><li>This setting controls the API: [IsEducationEnvironment](/uwp/api/windows.system.profile.educationsettings)|
 | Account models | **AccountModel**: this option controls which types of users can sign-in to the device, and can enable the Guest and Kiosk account options. |
 | Account management | **EnableAccountManager**: when enabled, automatic account management is turned on. The following settings control the behavior of account manager: <li> **DeletionPolicy**</li><li>**DiskLevelDeletion**</li><li>**DiskLevelCaching**</li><li>**InactiveThreshold**</li>|