diff --git a/src/CalcViewModel/Common/NavCategory.cpp b/src/CalcViewModel/Common/NavCategory.cpp
index 9985da45..9385fef2 100644
--- a/src/CalcViewModel/Common/NavCategory.cpp
+++ b/src/CalcViewModel/Common/NavCategory.cpp
@@ -61,20 +61,31 @@ bool IsGraphingModeAvailable()
 }
 
 Box<bool> ^ _isGraphingModeEnabledCached = nullptr;
-bool IsGraphingModeEnabled()
+bool IsGraphingModeEnabled(User ^ currentUser = nullptr)
 {
-    // CSHARP_MIGRATION: TODO: merge PR ##1471 to fix below bug before we release to PROD
-#ifdef _DEBUG
-    _isGraphingModeEnabledCached = true;
-#else
-    throw "CSHARP_MIGRATION: EXCEPTION";
-#endif // _DEBUG
+    if (!IsGraphingModeAvailable())
+    {
+        return false;
+    }
+
+    if (_isGraphingModeEnabledCached != nullptr)
+    {
+        return _isGraphingModeEnabledCached->Value;
+    }
+
+    if (!currentUser)
+    {
+        return true;
+    }
+
+    auto namedPolicyData = NamedPolicy::GetPolicyFromPathForUser(currentUser, L"Education", L"AllowGraphingCalculator");
+    _isGraphingModeEnabledCached = namedPolicyData->GetBoolean() == true;
 
     return _isGraphingModeEnabledCached->Value;
 }
 
 // The order of items in this list determines the order of items in the menu.
-static const list<NavCategoryInitializer> s_categoryManifest = [] {
+static list<NavCategoryInitializer> s_categoryManifest = [] {
     auto res = list<NavCategoryInitializer>{ NavCategoryInitializer{ ViewMode::Standard,
                                                                      STANDARD_ID,
                                                                      L"Standard",
@@ -100,7 +111,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
     bool supportGraphingCalculator = IsGraphingModeAvailable();
     if (supportGraphingCalculator)
     {
-        const bool isEnabled = IsGraphingModeEnabled();
+        bool isEnabled = IsGraphingModeEnabled();
         res.push_back(NavCategoryInitializer{ ViewMode::Graphing,
                                               GRAPHING_ID,
                                               L"Graphing",
@@ -268,6 +279,25 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
     return res;
 }();
 
+void NavCategory::InitializeCategoryManifest(User ^ user)
+{
+    int i = 0;
+    for (NavCategoryInitializer category : s_categoryManifest)
+    {
+        if (category.viewMode == ViewMode::Graphing)
+        {
+            auto navCatInit = s_categoryManifest.begin();
+            std::advance(navCatInit, i);
+            (*navCatInit).isEnabled = IsGraphingModeEnabled(user);
+            break;
+        }
+        else
+        {
+            i++;
+        }
+    }
+ }
+
 // This function should only be used when storing the mode to app data.
 int NavCategory::Serialize(ViewMode mode)
 {
diff --git a/src/CalcViewModel/Common/NavCategory.h b/src/CalcViewModel/Common/NavCategory.h
index 74cfaeed..1af04676 100644
--- a/src/CalcViewModel/Common/NavCategory.h
+++ b/src/CalcViewModel/Common/NavCategory.h
@@ -92,7 +92,7 @@ namespace CalculatorApp::ViewModel
             const MyVirtualKey virtualKey;
             const wchar_t* const accessKey;
             const bool supportsNegative;
-            const bool isEnabled;
+            bool isEnabled;
         };
 
     private
@@ -140,6 +140,8 @@ namespace CalculatorApp::ViewModel
             static bool IsDateCalculatorViewMode(ViewMode mode);
             static bool IsConverterViewMode(ViewMode mode);
 
+            static void InitializeCategoryManifest(Windows::System::User ^ user);
+
             static Platform::String ^ GetFriendlyName(ViewMode mode);
             static Platform::String ^ GetNameResourceKey(ViewMode mode);
             static CategoryGroupType GetGroupType(ViewMode mode);
diff --git a/src/Calculator/App.xaml.cs b/src/Calculator/App.xaml.cs
index bce8e909..79b7d038 100644
--- a/src/Calculator/App.xaml.cs
+++ b/src/Calculator/App.xaml.cs
@@ -86,6 +86,7 @@ namespace CalculatorApp
                 // If the app got pre-launch activated, then save that state in a flag
                 m_preLaunched = true;
             }
+            NavCategory.InitializeCategoryManifest(args.User);
             OnAppLaunch(args, args.Arguments);
         }