diff --git a/lib/adminlib.php b/lib/adminlib.php
index 18f06e73d46..fa7adbeff69 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -7544,7 +7544,7 @@ class admin_setting_managewebservicetokens extends admin_setting {
 
                 $validuntil = '';
                 if (!empty($token->validuntil)) {
-                    $validuntil = date("F j, Y"); //TODO: language support (look for moodle function)
+                    $validuntil = userdate($token->validuntil, get_string('strftimedatetime', 'langconfig'));
                 }
 
                 $iprestriction = '';
diff --git a/webservice/renderer.php b/webservice/renderer.php
index 52f0e5f545a..f78309dd435 100644
--- a/webservice/renderer.php
+++ b/webservice/renderer.php
@@ -332,7 +332,7 @@ class core_webservice_renderer extends plugin_renderer_base {
 
                 $validuntil = '';
                 if (!empty($token->validuntil)) {
-                    $validuntil = date("F j, Y"); //TODO MDL-31193 language support (look for moodle function)
+                    $validuntil = userdate($token->validuntil, get_string('strftimedatetime', 'langconfig'));
                 }
 
                 $tokenname = $token->name;