diff --git a/modules/authX509/dictionaries/X509warning.definition.json b/modules/authX509/dictionaries/X509warning.definition.json
index e74d3077517bc60b78b8ff54d9f4baef80114fa4..d56bed1be7cac133e4e66fafdfe182c19be23de0 100644
--- a/modules/authX509/dictionaries/X509warning.definition.json
+++ b/modules/authX509/dictionaries/X509warning.definition.json
@@ -1,6 +1,6 @@
 {
   "warning": {
-    "en": "Your certificate will expire in %days% days."
+    "en": "Your certificate will expire in %daysleft% days."
   },
   "warning_header": {
     "en": "Your certificate is about to expire."
diff --git a/modules/authX509/dictionaries/X509warning.translation.json b/modules/authX509/dictionaries/X509warning.translation.json
index 4a9b0b95774683605ea7b24229f8fff0705265b2..e22096295f62ed70bd97b712e0910f4f06f5f737 100644
--- a/modules/authX509/dictionaries/X509warning.translation.json
+++ b/modules/authX509/dictionaries/X509warning.translation.json
@@ -1,10 +1,10 @@
 {
   "warning": {
-    "nl": "Je certificaat verloopt over %days% dagen.",
-    "no": "Sertifikatet ditt vil utløpe om %days% dager.",
-    "da": "Dit certifikat udløber om %days% dage.",
-    "es": "Su certificado caduca en %days% dĂ­as.",
-    "el": "\u0397 \u03b9\u03c3\u03c7\u03cd\u03c2 \u03c4\u03bf\u03c5 \u03c0\u03b9\u03c3\u03c4\u03bf\u03c0\u03bf\u03b9\u03b7\u03c4\u03b9\u03ba\u03bf\u03cd \u03c3\u03b1\u03c2 \u03b8\u03b1 \u03bb\u03ae\u03be\u03b5\u03b9 \u03c3\u03b5 %days%."
+    "nl": "Je certificaat verloopt over %daysleft% dagen.",
+    "no": "Sertifikatet ditt vil utløpe om %daysleft% dager.",
+    "da": "Dit certifikat udløber om %daysleft% dage.",
+    "es": "Su certificado caduca en %daysleft% dĂ­as.",
+    "el": "\u0397 \u03b9\u03c3\u03c7\u03cd\u03c2 \u03c4\u03bf\u03c5 \u03c0\u03b9\u03c3\u03c4\u03bf\u03c0\u03bf\u03b9\u03b7\u03c4\u03b9\u03ba\u03bf\u03cd \u03c3\u03b1\u03c2 \u03b8\u03b1 \u03bb\u03ae\u03be\u03b5\u03b9 \u03c3\u03b5 %daysleft%."
   },
   "warning_header": {
     "nl": "Je certificaat verloopt binnenkort.",
diff --git a/modules/authX509/locales/da/LC_MESSAGES/authX509.po b/modules/authX509/locales/da/LC_MESSAGES/authX509.po
index 6e89789b11eeaedc1e17999179cc8e33806d6b24..a883034f930b787cb6816e7600cc31884625c17e 100644
--- a/modules/authX509/locales/da/LC_MESSAGES/authX509.po
+++ b/modules/authX509/locales/da/LC_MESSAGES/authX509.po
@@ -34,20 +34,20 @@ msgid "{authX509:X509error:certificate_header}"
 msgstr "X509 certifikat authentifikation"
 
 msgid "{authX509:X509warning:warning}"
-msgstr "Dit certifikat udløber om %days% dage."
+msgstr "Dit certifikat udløber om %daysleft% dage."
 
 msgid "Please renew your certificate in time."
 msgstr "Forny venligst dit certifikat i tide."
 
 #, python-format
-msgid "Your certificate will expire in %days% days."
-msgstr "Dit certifikat udløber om %days% dage."
+msgid "Your certificate will expire in %daysleft% days."
+msgstr "Dit certifikat udløber om %daysleft% dage."
 
 msgid "X509 certificate authentication"
 msgstr "X509 certifikat authentifikation"
 
 #, python-format
-msgid "Please  <a href='%renewurl%'>renew</a> your certificate in time."
+msgid "Please <a href='%renewurl%'>renew your certificate</a> in time."
 msgstr "<a href='%renewurl%'>Forny</a>, venligst dit certifikat før det udløber."
 
 msgid "Proceed"
diff --git a/modules/authX509/locales/el/LC_MESSAGES/authX509.po b/modules/authX509/locales/el/LC_MESSAGES/authX509.po
index 26cf3a027cbe01bb0a24cf710dda4127e44e0083..8fb335efc17d27d406955f0b34d1716b8a26bde5 100644
--- a/modules/authX509/locales/el/LC_MESSAGES/authX509.po
+++ b/modules/authX509/locales/el/LC_MESSAGES/authX509.po
@@ -36,20 +36,20 @@ msgid "{authX509:X509error:certificate_header}"
 msgstr "Ταυτοποίηση μέσω πιστοποιητικού X.509"
 
 msgid "{authX509:X509warning:warning}"
-msgstr "Η ισχύς του πιστοποιητικού σας θα λήξει σε %days%."
+msgstr "Η ισχύς του πιστοποιητικού σας θα λήξει σε %daysleft%."
 
 msgid "Please renew your certificate in time."
 msgstr "Παρακαλείστε να προχωρήσετε σε ανανέωση του πιστοποιητικού σας έγκαιρα."
 
 #, python-format
-msgid "Your certificate will expire in %days% days."
-msgstr "Η ισχύς του πιστοποιητικού σας θα λήξει σε %days%."
+msgid "Your certificate will expire in %daysleft% days."
+msgstr "Η ισχύς του πιστοποιητικού σας θα λήξει σε %daysleft%."
 
 msgid "X509 certificate authentication"
 msgstr "Ταυτοποίηση μέσω πιστοποιητικού X.509"
 
 #, python-format
-msgid "Please  <a href='%renewurl%'>renew</a> your certificate in time."
+msgid "Please <a href='%renewurl%'>renew your certificate</a> in time."
 msgstr ""
 "Παρακαλείστε να προχωρήσετε σε <a href=‘%renewurl%’>ανανέωση</a> του "
 "πιστοποιητικού σας έγκαιρα."
diff --git a/modules/authX509/locales/en/LC_MESSAGES/authX509.po b/modules/authX509/locales/en/LC_MESSAGES/authX509.po
index 6457d3edf9f73184fc4f7fa524fa0269a9badcde..6e317173c419d855cf6a408ec4f3760912be5f8e 100644
--- a/modules/authX509/locales/en/LC_MESSAGES/authX509.po
+++ b/modules/authX509/locales/en/LC_MESSAGES/authX509.po
@@ -34,21 +34,21 @@ msgid "{authX509:X509error:certificate_header}"
 msgstr "X509 certificate authentication"
 
 msgid "{authX509:X509warning:warning}"
-msgstr "Your certificate will expire in %days% days."
+msgstr "Your certificate will expire in %daysleft% days."
 
 msgid "Please renew your certificate in time."
 msgstr "Please renew your certificate in time."
 
 #, python-format
-msgid "Your certificate will expire in %days% days."
-msgstr "Your certificate will expire in %days% days."
+msgid "Your certificate will expire in %daysleft% days."
+msgstr "Your certificate will expire in %daysleft% days."
 
 msgid "X509 certificate authentication"
 msgstr "X509 certificate authentication"
 
 #, python-format
-msgid "Please  <a href='%renewurl%'>renew</a> your certificate in time."
-msgstr "Please  <a href='%renewurl%'>renew</a> your certificate in time."
+msgid "Please <a href='%renewurl%'>renew your certificate</a> in time."
+msgstr "Please <a href='%renewurl%'>renew your certificate</a> in time."
 
 msgid "Proceed"
 msgstr "Proceed"
diff --git a/modules/authX509/locales/es/LC_MESSAGES/authX509.po b/modules/authX509/locales/es/LC_MESSAGES/authX509.po
index 7256e926b8d3551b5a895d521743ba83bfc38b19..e25961f4ea500c71aac0d07059d3d0e247ef623a 100644
--- a/modules/authX509/locales/es/LC_MESSAGES/authX509.po
+++ b/modules/authX509/locales/es/LC_MESSAGES/authX509.po
@@ -36,21 +36,21 @@ msgid "{authX509:X509error:certificate_header}"
 msgstr "AutenticaciĂłn mediante certificado X509"
 
 msgid "{authX509:X509warning:warning}"
-msgstr "Su certificado caduca en %days% dĂ­as."
+msgstr "Su certificado caduca en %daysleft% dĂ­as."
 
 msgid "Please renew your certificate in time."
 msgstr "Por favor, renueve su certificado a tiempo."
 
 #, python-format
-msgid "Your certificate will expire in %days% days."
-msgstr "Su certificado caduca en %days% dĂ­as."
+msgid "Your certificate will expire in %daysleft% days."
+msgstr "Su certificado caduca en %daysleft% dĂ­as."
 
 msgid "X509 certificate authentication"
 msgstr "AutenticaciĂłn mediante certificado X509"
 
 #, python-format
-msgid "Please  <a href='%renewurl%'>renew</a> your certificate in time."
-msgstr "Por favor, <a href=‘%renewurl%’>renueve</a> su certificado a tiempo."
+msgid "Please <a href='%renewurl%'>renew your certificate</a> in time."
+msgstr "Por favor, <a href=‘%renewurl%’>renueve su certificado</a> a tiempo."
 
 msgid "Proceed"
 msgstr "Continuar"
diff --git a/modules/authX509/locales/nb/LC_MESSAGES/authX509.po b/modules/authX509/locales/nb/LC_MESSAGES/authX509.po
index 1a74b995c595348f39769573f7e147771bda08e3..6517289e0bb7986b1aec16c5d699b67b20f488ba 100644
--- a/modules/authX509/locales/nb/LC_MESSAGES/authX509.po
+++ b/modules/authX509/locales/nb/LC_MESSAGES/authX509.po
@@ -36,20 +36,20 @@ msgid "{authX509:X509error:certificate_header}"
 msgstr "X509 sertifikatautentisering"
 
 msgid "{authX509:X509warning:warning}"
-msgstr "Sertifikatet ditt vil utløpe om %days% dager."
+msgstr "Sertifikatet ditt vil utløpe om %daysleft% dager."
 
 msgid "Please renew your certificate in time."
 msgstr "Vennligst forny sertifikatet ditt før det utløper."
 
 #, python-format
-msgid "Your certificate will expire in %days% days."
-msgstr "Sertifikatet ditt vil utløpe om %days% dager."
+msgid "Your certificate will expire in %daysleft% days."
+msgstr "Sertifikatet ditt vil utløpe om %daysleft% dager."
 
 msgid "X509 certificate authentication"
 msgstr "X509 sertifikatautentisering"
 
 #, python-format
-msgid "Please  <a href='%renewurl%'>renew</a> your certificate in time."
+msgid "Please <a href='%renewurl%'>renew your certificate</a> in time."
 msgstr ""
 "Vennligst <a href=‘%renewurl%’>forny</a> sertifikatet ditt før det "
 "utløper."
diff --git a/modules/authX509/locales/nl/LC_MESSAGES/authX509.po b/modules/authX509/locales/nl/LC_MESSAGES/authX509.po
index 5e341db07117801add3c15160524396202c3e766..3515e80ead16e2a92048eebab00d274cef65441a 100644
--- a/modules/authX509/locales/nl/LC_MESSAGES/authX509.po
+++ b/modules/authX509/locales/nl/LC_MESSAGES/authX509.po
@@ -36,21 +36,21 @@ msgid "{authX509:X509error:certificate_header}"
 msgstr "Authenticatie via X509-certificaat"
 
 msgid "{authX509:X509warning:warning}"
-msgstr "Je certificaat verloopt over %days% dagen."
+msgstr "Je certificaat verloopt over %daysleft% dagen."
 
 msgid "Please renew your certificate in time."
 msgstr "Vervang tijdig je certificaat."
 
 #, python-format
-msgid "Your certificate will expire in %days% days."
-msgstr "Je certificaat verloopt over %days% dagen."
+msgid "Your certificate will expire in %daysleft% days."
+msgstr "Je certificaat verloopt over %daysleft% dagen."
 
 msgid "X509 certificate authentication"
 msgstr "Authenticatie via X509-certificaat"
 
 #, python-format
-msgid "Please  <a href='%renewurl%'>renew</a> your certificate in time."
-msgstr "<a href='%renewurl%'>Vervang</a> tijdig je certificaat."
+msgid "Please <a href=\"%renewurl%\">renew your certificate</a> in time."
+msgstr "<a href=\"%renewurl%\">Vervang tijdig je certificaat</a>."
 
 msgid "Proceed"
 msgstr "Verder"
diff --git a/modules/authX509/templates/X509warning.php b/modules/authX509/templates/X509warning.php
index 55b8b6281d7f6a2c2b86fed832aaad509a76a923..704ed8865e2f1a5a9c767e7c8e127a882b03e088 100644
--- a/modules/authX509/templates/X509warning.php
+++ b/modules/authX509/templates/X509warning.php
@@ -11,7 +11,7 @@
  */
 
 $warning = $this->t('{authX509:X509warning:warning}', array(
-    '%days%' => htmlspecialchars($this->data['daysleft']),
+    '%daysleft%' => htmlspecialchars($this->data['daysleft']),
 ));
 
 if( $this->data['renewurl']) {