diff --git a/lib/data/web_client.dart b/lib/data/web_client.dart
index b6ebc3c95..8de66a9ba 100644
--- a/lib/data/web_client.dart
+++ b/lib/data/web_client.dart
@@ -135,6 +135,7 @@ class WebClient {
 }
 
 String _checkUrl(String url) {
+  print('## _checkUrl (PRE): $url');
   if (!url.contains('/api/v1')) {
     url = '/api/v1' + url;
   }
@@ -147,6 +148,7 @@ String _checkUrl(String url) {
     url += '?';
   }
 
+  print('## _checkUrl (POST): $url');
   return url;
 }
 
diff --git a/lib/ui/client/client_screen.dart b/lib/ui/client/client_screen.dart
index 9f56f89fe..379633f1b 100644
--- a/lib/ui/client/client_screen.dart
+++ b/lib/ui/client/client_screen.dart
@@ -122,6 +122,7 @@ class ClientScreen extends StatelessWidget {
       floatingActionButton: userCompany.canCreate(EntityType.client)
           ? FloatingActionButton(
               heroTag: 'client_fab',
+              backgroundColor: Theme.of(context).primaryColorDark,
               onPressed: () {
                 createEntityByType(
                     context: context, entityType: EntityType.client);
diff --git a/lib/ui/credit/credit_presenter.dart b/lib/ui/credit/credit_presenter.dart
index 700fef032..e08a88ab8 100644
--- a/lib/ui/credit/credit_presenter.dart
+++ b/lib/ui/credit/credit_presenter.dart
@@ -39,7 +39,7 @@ class CreditPresenter extends EntityPresenter {
       case CreditFields.date:
         return Text(formatDate(credit.date, context));
       case CreditFields.amount:
-        return Text(formatNumber(credit.amount, context));
+        return Text(formatNumber(credit.amount, context, clientId: credit.clientId));
       case CreditFields.balance:
         return Text(formatNumber(credit.balance, context));
     }
diff --git a/lib/ui/invoice/invoice_presenter.dart b/lib/ui/invoice/invoice_presenter.dart
index 91bf102ea..0c7fc2268 100644
--- a/lib/ui/invoice/invoice_presenter.dart
+++ b/lib/ui/invoice/invoice_presenter.dart
@@ -43,9 +43,9 @@ class InvoicePresenter extends EntityPresenter {
       case InvoiceFields.invoiceDate:
         return Text(formatDate(invoice.date, context));
       case InvoiceFields.amount:
-        return Text(formatNumber(invoice.amount, context));
+        return Text(formatNumber(invoice.amount, context, clientId: invoice.clientId));
       case InvoiceFields.balance:
-        return Text(formatNumber(invoice.balance, context));
+        return Text(formatNumber(invoice.balance, context, clientId: invoice.clientId));
       case InvoiceFields.dueDate:
         return Text(formatDate(invoice.dueDate, context));
     }
diff --git a/lib/ui/quote/quote_presenter.dart b/lib/ui/quote/quote_presenter.dart
index 8a53cfa58..5dc565511 100644
--- a/lib/ui/quote/quote_presenter.dart
+++ b/lib/ui/quote/quote_presenter.dart
@@ -43,7 +43,7 @@ class QuotePresenter extends EntityPresenter {
       case QuoteFields.date:
         return Text(formatDate(quote.date, context));
       case QuoteFields.amount:
-        return Text(formatNumber(quote.amount, context));
+        return Text(formatNumber(quote.amount, context, clientId: quote.clientId));
       case QuoteFields.validUntil:
         return Text(formatDate(quote.dueDate, context));
     }