diff --git a/app/models/university/with_invoice.rb b/app/models/university/with_invoice.rb
index 8b5418ccd0e1d3f6d7596bf6b1fba9f5ec51baca..d5750c89345b8138bf6fe2995989f4efdb8d818e 100644
--- a/app/models/university/with_invoice.rb
+++ b/app/models/university/with_invoice.rb
@@ -5,7 +5,7 @@ module University::WithInvoice
 
     before_save :denormalize_invoice_date
 
-    scope :contributing, -> { where.not(contribution_amount: [nil, 0.0]) }
+    scope :contributing, -> { where.not(contribution_amount: [nil, 0.0, '', 0]) }
 
     def invoice_proximity
       if next_invoice_in_days < 30
diff --git a/config/locales/server_admin/en.yml b/config/locales/server_admin/en.yml
index 2905b62c51e115e3bc73d7a523203632de3a8cad..db130e4b1c59f91b41a02a9ab79523be9408d02f 100644
--- a/config/locales/server_admin/en.yml
+++ b/config/locales/server_admin/en.yml
@@ -3,7 +3,7 @@ en:
     blocks:
       about: About
       blocks_saved:
-        one: "1 block re-saved"
+        one: "%{count} block re-saved"
         other: "%{count} blocks re-saved"
       data: Data
       open: Open
@@ -27,7 +27,7 @@ en:
     see_list: See the list
     universities:
       contributing:
-        one: 1 contributing university
+        one: "%{count} contributing university"
         other: "%{count} contributing universities"
       contributions_total: Contributions (total)
       invoice_informations: Invoice informations
diff --git a/config/locales/server_admin/fr.yml b/config/locales/server_admin/fr.yml
index d0f2ddb2389ad0eb38d1db8a47ecc1b4a96b4751..93392d37b171c2648257c15cdca5d17308a10f55 100644
--- a/config/locales/server_admin/fr.yml
+++ b/config/locales/server_admin/fr.yml
@@ -3,7 +3,7 @@ fr:
     blocks:
       about: Sujet
       blocks_saved:
-        one: "1 bloc re-sauvé"
+        one: "%{count} bloc re-sauvé"
         other: "%{count} blocs re-sauvés"
       data: Données
       open: Ouvrir
@@ -27,7 +27,7 @@ fr:
     see_list: Voir la liste
     universities:
       contributing:
-        one: 1 université contributrice
+        one: "%{count} université contributrice"
         other: "%{count} universités contributrices"
       contributions_total: Contributions (total)
       invoice_informations: Données de facturation
diff --git a/config/server_navigation.rb b/config/server_navigation.rb
index 5fb45438459d4f44f4c0bba5bd7a081dd28fcf9f..ca4a4431ae2c353d78d723b622a933d0faf57880 100644
--- a/config/server_navigation.rb
+++ b/config/server_navigation.rb
@@ -5,11 +5,11 @@ SimpleNavigation::Configuration.run do |navigation|
   navigation.selected_class = 'active'
   navigation.items do |primary|
     primary.item  :dashboard,
-                  t('dashboard'),
+                  t('admin.dashboard'),
                   server_root_path,
                   { kind: :header, highlights_on: %r{server$} }
     primary.item  :server,
-                  t('server'),
+                  t('menu.server_admin'),
                   nil,
                   { kind: :header }
     primary.item  :universities,