diff --git a/lib/main.dart b/lib/main.dart
index 64b905a264b..adc4d26bb81 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -294,6 +294,14 @@ void _registerErrorHandlers() {
   */
 
   ErrorWidget.builder = (FlutterErrorDetails details) {
-    return Material(child: Center(child: Text(details.toString())));
+    return Material(
+      color: Colors.grey.shade100,
+      child: Center(
+        child: Text(
+          details.toString(),
+          style: TextStyle(color: Colors.black),
+        ),
+      ),
+    );
   };
 }
diff --git a/lib/redux/app/app_middleware.dart b/lib/redux/app/app_middleware.dart
index fd36a458364..3e827cf1802 100644
--- a/lib/redux/app/app_middleware.dart
+++ b/lib/redux/app/app_middleware.dart
@@ -587,6 +587,8 @@ Middleware<AppState> _createClearData(
   return (Store<AppState> store, dynamic action, NextDispatcher next) async {
     companyRepositories.forEach((repo) => repo.delete());
 
+    store.dispatch(PersistData());
+
     next(action);
   };
 }
diff --git a/lib/ui/app/dialogs/health_check_dialog.dart b/lib/ui/app/dialogs/health_check_dialog.dart
index 9bbb6eda07f..dfe928d5881 100644
--- a/lib/ui/app/dialogs/health_check_dialog.dart
+++ b/lib/ui/app/dialogs/health_check_dialog.dart
@@ -139,7 +139,10 @@ class _HealthCheckDialogState extends State<HealthCheckDialog> {
                 ),
                 _HealthListTile(
                   title: 'PHP Info',
-                  isValid: _response.phpVersion.isOkay,
+                  // TODO move this logic to the backend
+                  isValid: _response.phpVersion.isOkay &&
+                      webPhpVersion.startsWith('8') &&
+                      cliPhpVersion.startsWith('8'),
                   subtitle: 'Web: v$webPhpVersion\nCLI: v$cliPhpVersion' +
                       (phpMemoryLimit.isNotEmpty
                           ? '\nMemory Limit: $phpMemoryLimit'
diff --git a/lib/ui/invoice/invoice_screen.dart b/lib/ui/invoice/invoice_screen.dart
index 6c3d3f299cd..806ddab5a32 100644
--- a/lib/ui/invoice/invoice_screen.dart
+++ b/lib/ui/invoice/invoice_screen.dart
@@ -72,6 +72,11 @@ class InvoiceScreen extends StatelessWidget {
           ..id = kInvoiceStatusPastDue
           ..name = localization.pastDue,
       ),
+      InvoiceStatusEntity().rebuild(
+        (b) => b
+          ..id = kInvoiceStatusCancelled
+          ..name = localization.cancelled,
+      ),
     ];
 
     return ListScaffold(