diff --git a/lib/data/models/company_gateway_model.dart b/lib/data/models/company_gateway_model.dart
index 3c6256300..e94c0dfad 100644
--- a/lib/data/models/company_gateway_model.dart
+++ b/lib/data/models/company_gateway_model.dart
@@ -243,24 +243,18 @@ abstract class FeesAndLimitsSettings
   @BuiltValueField(wireName: 'fee_tax_rate1')
   double get taxRate1;
 
-  // TODO remove this
-  @nullable
   @BuiltValueField(wireName: 'fee_tax_name1')
   String get taxName1;
 
   @BuiltValueField(wireName: 'fee_tax_rate2')
   double get taxRate2;
 
-  // TODO remove this
-  @nullable
   @BuiltValueField(wireName: 'fee_tax_name2')
   String get taxName2;
 
   @BuiltValueField(wireName: 'fee_tax_rate3')
   double get taxRate3;
 
-  // TODO remove this
-  @nullable
   @BuiltValueField(wireName: 'fee_tax_name3')
   String get taxName3;
 
diff --git a/lib/data/models/company_gateway_model.g.dart b/lib/data/models/company_gateway_model.g.dart
index c35803b43..37cc85bad 100644
--- a/lib/data/models/company_gateway_model.g.dart
+++ b/lib/data/models/company_gateway_model.g.dart
@@ -346,34 +346,26 @@ class _$FeesAndLimitsSettingsSerializer
       'fee_tax_rate1',
       serializers.serialize(object.taxRate1,
           specifiedType: const FullType(double)),
+      'fee_tax_name1',
+      serializers.serialize(object.taxName1,
+          specifiedType: const FullType(String)),
       'fee_tax_rate2',
       serializers.serialize(object.taxRate2,
           specifiedType: const FullType(double)),
+      'fee_tax_name2',
+      serializers.serialize(object.taxName2,
+          specifiedType: const FullType(String)),
       'fee_tax_rate3',
       serializers.serialize(object.taxRate3,
           specifiedType: const FullType(double)),
+      'fee_tax_name3',
+      serializers.serialize(object.taxName3,
+          specifiedType: const FullType(String)),
       'adjust_fee_percent',
       serializers.serialize(object.adjustFeePercent,
           specifiedType: const FullType(bool)),
     ];
-    if (object.taxName1 != null) {
-      result
-        ..add('fee_tax_name1')
-        ..add(serializers.serialize(object.taxName1,
-            specifiedType: const FullType(String)));
-    }
-    if (object.taxName2 != null) {
-      result
-        ..add('fee_tax_name2')
-        ..add(serializers.serialize(object.taxName2,
-            specifiedType: const FullType(String)));
-    }
-    if (object.taxName3 != null) {
-      result
-        ..add('fee_tax_name3')
-        ..add(serializers.serialize(object.taxName3,
-            specifiedType: const FullType(String)));
-    }
+
     return result;
   }
 
@@ -1115,12 +1107,21 @@ class _$FeesAndLimitsSettings extends FeesAndLimitsSettings {
     if (taxRate1 == null) {
       throw new BuiltValueNullFieldError('FeesAndLimitsSettings', 'taxRate1');
     }
+    if (taxName1 == null) {
+      throw new BuiltValueNullFieldError('FeesAndLimitsSettings', 'taxName1');
+    }
     if (taxRate2 == null) {
       throw new BuiltValueNullFieldError('FeesAndLimitsSettings', 'taxRate2');
     }
+    if (taxName2 == null) {
+      throw new BuiltValueNullFieldError('FeesAndLimitsSettings', 'taxName2');
+    }
     if (taxRate3 == null) {
       throw new BuiltValueNullFieldError('FeesAndLimitsSettings', 'taxRate3');
     }
+    if (taxName3 == null) {
+      throw new BuiltValueNullFieldError('FeesAndLimitsSettings', 'taxName3');
+    }
     if (adjustFeePercent == null) {
       throw new BuiltValueNullFieldError(
           'FeesAndLimitsSettings', 'adjustFeePercent');
diff --git a/lib/redux/app/app_state.dart b/lib/redux/app/app_state.dart
index 063b2705e..9341de04b 100644
--- a/lib/redux/app/app_state.dart
+++ b/lib/redux/app/app_state.dart
@@ -465,7 +465,8 @@ abstract class AppState implements Built<AppState, AppStateBuilder> {
     //return 'History: $historyList';
     //return 'Use inclusive: ${invoiceUIState.editing.usesInclusiveTaxes}';
     //return 'Invitations: ${invoiceUIState.editing.invitations}';
-    return 'Token: ${userCompanyStates.map((state) => state.token.token).toList().join(', ')}';
+    //return 'Token: ${userCompanyStates.map((state) => state.token.token).toList().join(', ')}';
+    return 'Settings: ${userCompany.settings}';
     return 'Layout: ${prefState.appLayout}, Route: ${uiState.currentRoute} Prev: ${uiState.previousRoute}';
   }
 }
diff --git a/lib/redux/company/company_reducer.dart b/lib/redux/company/company_reducer.dart
index 505efde3d..338e65ce7 100644
--- a/lib/redux/company/company_reducer.dart
+++ b/lib/redux/company/company_reducer.dart
@@ -92,7 +92,7 @@ UserCompanyEntity loadCompanySuccessReducer(
   var userCompany = action.userCompany;
 
   // Check user has a blank user settings object
-  if (userCompany?.settings?.accentColor == null) {
+  if (userCompany.settings == null) {
     userCompany =
         userCompany.rebuild((b) => b..settings.replace(UserSettingsEntity()));
   }
diff --git a/lib/ui/settings/user_details.dart b/lib/ui/settings/user_details.dart
index 2295e6a2f..60fe829da 100644
--- a/lib/ui/settings/user_details.dart
+++ b/lib/ui/settings/user_details.dart
@@ -135,7 +135,7 @@ class _UserDetailsState extends State<UserDetails> {
             children: <Widget>[
               FormColorPicker(
                 labelText: localization.accentColor,
-                initialValue: user.userCompany.settings.accentColor,
+                initialValue: viewModel.state.userCompany.settings.accentColor,
                 onSelected: (value) {
                   widget.viewModel.onChanged(user.rebuild(
                       (b) => b..userCompany.settings.accentColor = value));