diff --git a/lib/redux/app/app_state.dart b/lib/redux/app/app_state.dart
index 0b514b322..d67b2ab67 100644
--- a/lib/redux/app/app_state.dart
+++ b/lib/redux/app/app_state.dart
@@ -384,7 +384,7 @@ abstract class AppState implements Built<AppState, AppStateBuilder> {
     //return 'Fields: ${uiState.settingsUIState.company.customFields} - ${company.customFields}';
     //return 'Custom: ${uiState.settingsUIState.company.settings.customValue1} - ${company.settings.customValue1}';
     //return 'Platform: ${userCompany.token.token}';
-    return 'Activites: ${company.activities}';
+    return 'Activites: ${company.users} ${company.userMap}';
     return 'Route: ${uiState.currentRoute} Prev: ${uiState.previousRoute}';
   }
 }
diff --git a/lib/redux/company/company_reducer.dart b/lib/redux/company/company_reducer.dart
index c1a8735e0..7a038bb91 100644
--- a/lib/redux/company/company_reducer.dart
+++ b/lib/redux/company/company_reducer.dart
@@ -61,17 +61,15 @@ UserCompanyEntity loadCompanySuccessReducer(
   var userCompany = action.userCompany;
 
   userCompany = userCompany.rebuild((b) => b.company
-    ..taxRates.replace(<TaxRateEntity>[])
     ..taskStatuses.replace(<TaskStatusEntity>[])
     ..taskStatusMap.replace(BuiltMap<String, TaskStatusEntity>())
     ..expenseCategories.replace(<ExpenseCategoryEntity>[])
-    ..expenseCategoryMap.replace(BuiltMap<String, ExpenseCategoryEntity>())
-    ..users.replace(<UserEntity>[])
-    ..userMap.replace(BuiltMap<String, UserEntity>()));
+    ..expenseCategoryMap.replace(BuiltMap<String, ExpenseCategoryEntity>()));
+
+  /*
 
   return userCompany;
 
-  /*
   if (userCompany.company.taskStatuses != null) {
     userCompany = userCompany
       ..company.rebuild((b) => b
@@ -91,6 +89,7 @@ UserCompanyEntity loadCompanySuccessReducer(
           value: (dynamic item) => item,
         )));
   }
+  */
 
   return userCompany
     ..company.rebuild((b) => b
@@ -99,7 +98,6 @@ UserCompanyEntity loadCompanySuccessReducer(
         key: (dynamic item) => item.id,
         value: (dynamic item) => item,
       )));
-   */
 }
 
 UserCompanyEntity saveCompanySuccessReducer(