diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index da8498683..775c27bae 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -17,7 +17,7 @@ The [issue tracker](https://github.com/LaCasemate/fab-manager/issues) is the pre
 [features requests](#features) and [submitting pull requests](#pull-requests), but please respect the following 
 restrictions:
 
-* Please **do not** use the issue tracker for personal support requests (use [the forum](http://www.fab-manager.com/forum)).
+* Please **do not** use the issue tracker for personal support requests (use [the forum](https://forum.fab-manager.com)).
 
 * Please **do not** derail or troll issues. Keep the discussion on topic and respect the opinions of others.
 
diff --git a/app/assets/javascripts/filters/filters.coffee b/app/assets/javascripts/filters/filters.coffee
index 2f3090870..686d9e40b 100644
--- a/app/assets/javascripts/filters/filters.coffee
+++ b/app/assets/javascripts/filters/filters.coffee
@@ -112,25 +112,7 @@ Application.Filters.filter "toTrusted", [ "$sce", ($sce) ->
 
 Application.Filters.filter "planIntervalFilter", [ ->
   (interval, intervalCount) ->
-    if typeof intervalCount != 'number'
-      switch interval
-        when 'day' then return 'jour'
-        when 'week' then return 'semaine'
-        when 'month' then return 'mois'
-        when 'year' then return 'année'
-    else
-      if intervalCount == 1
-        switch interval
-          when 'day' then return 'un jour'
-          when 'week' then return 'une semaine'
-          when 'month' then return 'un mois'
-          when 'year' then return 'un an'
-      else
-        switch interval
-          when 'day' then return intervalCount+ ' jours'
-          when 'week' then return intervalCount+ ' semaines'
-          when 'month' then return intervalCount+ ' mois'
-          when 'year' then return intervalCount+ ' ans'
+    moment.duration(intervalCount, interval).humanize()
 ]
 
 Application.Filters.filter "humanReadablePlanName", ['$filter', ($filter)->