diff --git a/src/App/Pages/Generator/GeneratorPage.xaml b/src/App/Pages/Generator/GeneratorPage.xaml
index f51301e2c..e4630f1cf 100644
--- a/src/App/Pages/Generator/GeneratorPage.xaml
+++ b/src/App/Pages/Generator/GeneratorPage.xaml
@@ -176,7 +176,8 @@
                             HorizontalOptions="StartAndExpand" />
                         <Switch
                             IsToggled="{Binding Uppercase}"
-                            IsEnabled="{Binding IsUppercaseSwitchEnabled}"
+                            IsEnabled="{Binding EnforcedPolicyOptions.UseUppercase,
+                                Converter={StaticResource inverseBool}}"
                             StyleClass="box-value"
                             HorizontalOptions="End" />
                     </StackLayout>
@@ -188,7 +189,8 @@
                             HorizontalOptions="StartAndExpand" />
                         <Switch
                             IsToggled="{Binding Lowercase}"
-                            IsEnabled="{Binding IsLowercaseSwitchEnabled}"
+                            IsEnabled="{Binding EnforcedPolicyOptions.UseLowercase,
+                                Converter={StaticResource inverseBool}}"
                             StyleClass="box-value"
                             HorizontalOptions="End" />
                     </StackLayout>
@@ -200,7 +202,8 @@
                             HorizontalOptions="StartAndExpand" />
                         <Switch
                             IsToggled="{Binding Number}"
-                            IsEnabled="{Binding IsNumberSwitchEnabled}"
+                            IsEnabled="{Binding EnforcedPolicyOptions.UseNumbers,
+                                Converter={StaticResource inverseBool}}"
                             StyleClass="box-value"
                             HorizontalOptions="End" />
                     </StackLayout>
@@ -212,7 +215,8 @@
                             HorizontalOptions="StartAndExpand" />
                         <Switch
                             IsToggled="{Binding Special}"
-                            IsEnabled="{Binding IsSpecialSwitchEnabled}"
+                            IsEnabled="{Binding EnforcedPolicyOptions.UseSpecial,
+                                Converter={StaticResource inverseBool}}"
                             StyleClass="box-value"
                             HorizontalOptions="End" />
                     </StackLayout>
diff --git a/src/App/Pages/Generator/GeneratorPageViewModel.cs b/src/App/Pages/Generator/GeneratorPageViewModel.cs
index afe888ac7..b0af77a78 100644
--- a/src/App/Pages/Generator/GeneratorPageViewModel.cs
+++ b/src/App/Pages/Generator/GeneratorPageViewModel.cs
@@ -229,11 +229,7 @@ namespace Bit.App.Pages
             set => SetProperty(ref _enforcedPolicyOptions, value,
                 additionalPropertyNames: new[]
                 {
-                    nameof(IsPolicyInEffect),
-                    nameof(IsUppercaseSwitchEnabled),
-                    nameof(IsLowercaseSwitchEnabled),
-                    nameof(IsNumberSwitchEnabled),
-                    nameof(IsSpecialSwitchEnabled)
+                    nameof(IsPolicyInEffect)
                 });
         }
 
@@ -242,14 +238,6 @@ namespace Bit.App.Pages
                                         _enforcedPolicyOptions.NumberCount > 0 || _enforcedPolicyOptions.UseSpecial ||
                                         _enforcedPolicyOptions.SpecialCount > 0;
 
-        public bool IsUppercaseSwitchEnabled => !IsPolicyInEffect || !EnforcedPolicyOptions.UseUppercase;
-
-        public bool IsLowercaseSwitchEnabled => !IsPolicyInEffect || !EnforcedPolicyOptions.UseLowercase;
-
-        public bool IsNumberSwitchEnabled => !IsPolicyInEffect || !EnforcedPolicyOptions.UseNumbers;
-
-        public bool IsSpecialSwitchEnabled => !IsPolicyInEffect || !EnforcedPolicyOptions.UseSpecial;
-        
         public int TypeSelectedIndex
         {
             get => _typeSelectedIndex;