diff --git a/lib/data/repositories/auth_repository.dart b/lib/data/repositories/auth_repository.dart
index 0c711ff33..3e7542531 100644
--- a/lib/data/repositories/auth_repository.dart
+++ b/lib/data/repositories/auth_repository.dart
@@ -90,7 +90,7 @@ class AuthRepository {
       'company.users',
       'company.tax_rates',
       'company.groups',
-      'company.company_gateways',
+      'company.company_gateways.gateway',
     ];
     url += '?include=${includes.join(',')}&include_static=true';
 
diff --git a/lib/redux/app/app_state.dart b/lib/redux/app/app_state.dart
index 521fa90cb..7f70b62f5 100644
--- a/lib/redux/app/app_state.dart
+++ b/lib/redux/app/app_state.dart
@@ -405,9 +405,9 @@ abstract class AppState implements Built<AppState, AppStateBuilder> {
   @override
   String toString() {
     //return 'Custom fields [UI]: ${uiState.settingsUIState.userCompany.company.customFields}, [DB] ${selectedCompany.customFields}';
-    return 'item: ${uiState.invoiceUIState.editing.lineItems}';
+    //return 'item: ${uiState.invoiceUIState.editing.lineItems}';
     //return 'defaultInvoiceDesignId: ${selectedCompany.settings.defaultInvoiceDesignId}';
-    //return 'Routes: Current: ${uiState.currentRoute} Prev: ${uiState.previousRoute}';
+    return 'Routes: Current: ${uiState.currentRoute} Prev: ${uiState.previousRoute}';
     //return 'Route: ${uiState.currentRoute}, Setting Type: ${uiState.settingsUIState.entityType}, Name: ${uiState.settingsUIState.settings.name}, Updated: ${uiState.settingsUIState.updatedAt}';
     //return 'Route: ${uiState.currentRoute}, Previous: ${uiState.previousRoute}, Layout: ${uiState.layout}, Menu: ${uiState.isMenuVisible}, History: ${uiState.isHistoryVisible}';
   }
diff --git a/lib/ui/company_gateway/edit/company_gateway_edit_vm.dart b/lib/ui/company_gateway/edit/company_gateway_edit_vm.dart
index ed029402e..497c6e6b4 100644
--- a/lib/ui/company_gateway/edit/company_gateway_edit_vm.dart
+++ b/lib/ui/company_gateway/edit/company_gateway_edit_vm.dart
@@ -76,9 +76,9 @@ class CompanyGatewayEditVM {
             companyGateway: CompanyGatewayEntity(),
             context: context,
             force: true));
-        store.dispatch(UpdateCurrentRoute(state.uiState.previousRoute));
 
          */
+        store.dispatch(UpdateCurrentRoute(state.uiState.previousRoute));
       },
       onSavePressed: (BuildContext context) {
         final Completer<CompanyGatewayEntity> completer =