diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 096c8af80f..38ef7203ec 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -98,10 +98,14 @@ delegate(document, '.status__content__spoiler-link', 'click', ({ target }) => {
 
 delegate(document, '.account_display_name', 'input', ({ target }) => {
   const nameCounter = document.querySelector('.name-counter');
-  nameCounter.textContent = 30 - length(target.value);
+  if (nameCounter) {
+    nameCounter.textContent = 30 - length(target.value);
+  }
 });
 
 delegate(document, '.account_note', 'input', ({ target }) => {
   const noteCounter = document.querySelector('.note-counter');
-  noteCounter.textContent = 160 - length(target.value);
+  if (noteCounter) {
+    noteCounter.textContent = 160 - length(target.value);
+  }
 });
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index 5b45c1bb26..b2b33c8ff0 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -4,10 +4,10 @@ ar:
     hints:
       defaults:
         avatar: PNG, GIF أو JPG. على الأكثر 2 ميغابيت . سوف يتم تصغيرها إلى 120x120px
-        display_name: "%{count} أحرف متبقية"
+        display_name: '<span class="name-counter">%{count}</span> أحرف متبقية'
         header: PNG, GIF or JPG. على الأكثر 2 ميغابيت . سوف يتم تصغيرها إلى 700x335px
         locked: يتطلب منك الموافقة يدويا على كل طلب للإشتراك بحسابك و منشوراتك تعرض لمتابعيك فقط دون غيرهم
-        note: "%{count} أحرف متبقية"
+        note: '<span class="note-counter">%{count}</span> أحرف متبقية'
       imports:
         data: ملف CSV تم تصديره من خادوم مثيل  آخر لماستدون
       sessions:
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index 5797eb3180..85ec0e4fc7 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -4,10 +4,10 @@ de:
     hints:
       defaults:
         avatar: PNG, GIF oder JPG. Maximal 2MB. Wird auf 120x120px herunterskaliert
-        display_name: '%{count} Zeichen verbleiben'
+        display_name: '<span class="name-counter">%{count}</span> Zeichen verbleiben'
         header: PNG, GIF oder JPG. Maximal 2MB. Wird auf 700x335px herunterskaliert
         locked: Erlaubt dir, Nutzer zu überprüfen, bevor sie dir folgen können
-        note: '%{count} Zeichen verbleiben'
+        note: '<span class="note-counter">%{count}</span> Zeichen verbleiben'
       imports:
         data: CSV-Datei, die von einer anderen Mastodon-Instanz exportiert wurde
       sessions:
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index ec74ff70db..6a888e3fe8 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -5,13 +5,13 @@ en:
       defaults:
         avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 120x120px
         display_name:
-            one: '<span class="name-counter">1</span> character left'
-            other: '<span class="name-counter">%{count}</span> characters left'
+          one: '<span class="name-counter">1</span> character left'
+          other: '<span class="name-counter">%{count}</span> characters left'
         header: PNG, GIF or JPG. At most 2MB. Will be downscaled to 700x335px
         locked: Requires you to manually approve followers and defaults post privacy to followers-only
         note:
-            one: '<span class="note-counter">1</span> character left'
-            other: '<span class="note-counter">%{count}</span> characters left'
+          one: '<span class="note-counter">1</span> character left'
+          other: '<span class="note-counter">%{count}</span> characters left'
       imports:
         data: CSV file exported from another Mastodon instance
       sessions:
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index e72d7f2bd5..363a5fd327 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -5,13 +5,13 @@ he:
       defaults:
         avatar: 'PNG, GIF או JPG. מקסימום 2MB. גודל התמונה יוקטן ל-120x120px'
         display_name:
-            one: 'נותרה אות<span class="name-counter">אחת</span>'
-            other: 'נותרו<span class="name-counter">%{count}</span> אותיות'
+          one: 'נותרה אות<span class="name-counter">אחת</span>'
+          other: 'נותרו<span class="name-counter">%{count}</span> אותיות'
         header: 'PNG, GIF או JPG. מקסימום 2MB. גודל התמונה יוקטן 700x335px'
         locked: 'מחייב אישור עוקבים באופן ידני. פרטיות ההודעות תהיה עוקבים-בלבד אלא אם יצוין אחרת'
         note:
-            one: 'נותרה אות<span class="note-counter">אחת</span>'
-            other: 'נותרו <span class="note-counter">%{count}</span> אותיות'
+          one: 'נותרה אות<span class="note-counter">אחת</span>'
+          other: 'נותרו <span class="note-counter">%{count}</span> אותיות'
       imports:
         data: 'קובץ CSV שיוצא משרת מסטודון אחר'
       sessions:
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 7a9f8c152c..fcf0923e01 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -4,10 +4,10 @@ ja:
     hints:
       defaults:
         avatar: 2MBまでのPNGやGIF、JPGが利用可能です。120x120pxまで縮小されます。
-        display_name: あと%{count}文字入力できます。
+        display_name: あと<span class="name-counter">%{count}</span>文字入力できます。
         header: 2MBまでのPNGやGIF、JPGが利用可能です。 700x335pxまで縮小されます。
         locked: フォロワーを手動で承認する必要があります。デフォルトではトゥートの公開範囲はフォロワーのみです。
-        note: あと%{count}文字入力できます。
+        note: あと<span class="note-counter">%{count}</span>文字入力できます。
       imports:
         data: 他の Mastodon インスタンスからエクスポートしたCSVファイルを選択して下さい
       sessions:
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index 1cbf6ea577..733e168926 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -4,10 +4,10 @@ pt-BR:
     labels:
       defaults:
         avatar: PNG, GIF or JPG. Máximo 2MB. Será reduzido para 120x120px
-        display_name: '%{count} caracteres restantes'
+        display_name: '<span class="name-counter">%{count}</span> caracteres restantes'
         header: PNG, GIF or JPG. Máximo 2MB. Será reduzido para 700x335px
         locked: Requer você aprovação manualmente seguidores e posts padrão de privacidade para seguidores-apenas
-        note: '%{count} caracteres restantes'
+        note: '<span class="note-counter">%{count}</span> caracteres restantes'
       imports:
         data: Arquivo CSV exportado de outra instancia Mastodon
       sessions:
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index ab96985c1b..b5e7eee674 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -4,10 +4,10 @@ ru:
     hints:
       defaults:
         avatar: PNG, GIF или JPG. Максимально 2MB. Будет уменьшено до 120x120px
-        display_name: 'Осталось символов: %{count}'
+        display_name: 'Осталось символов: <span class="name-counter">%{count}</span>'
         header: PNG, GIF или JPG. Максимально 2MB. Будет уменьшено до 700x335px
         locked: Потребует от Вас ручного подтверждения подписчиков, изменит приватность постов по умолчанию на "только для подписчиков"
-        note: 'Осталось символов: %{count}'
+        note: 'Осталось символов: <span class="note-counter">%{count}</span>'
       imports:
         data: Файл CSV, экспортированный с другого узла Mastodon
       sessions:
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index de206fe0dc..c58758da4b 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -5,13 +5,13 @@ th:
       defaults:
         avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 120x120px
         display_name:
-            one: '1 character left'
-            other: '%{count} characters left'
+          one: '<span class="name-counter">1</span> character left'
+          other: '<span class="name-counter">%{count}</span> characters left'
         header: PNG, GIF or JPG. At most 2MB. Will be downscaled to 700x335px
         locked: Requires you to manually approve followers and defaults post privacy to followers-only
         note:
-            one: '1 character left'
-            other: '%{count} characters left'
+          one: '<span class="name-counter">1</span> character left'
+          other: '<span class="note-counter">%{count}</span> characters left'
       imports:
         data: CSV file exported from another Mastodon instance
       sessions:
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index ff82f09724..80b6c771ca 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -5,10 +5,10 @@ tr:
     hints:
       defaults:
         avatar: En fazla 2MB olacak şekilde PNG, GIF veya JPG formatında yükleyiniz. 120x120px büyüklüğüne indirgenecektir
-        display_name: '%{count} karakter kaldı'
+        display_name: '<span class="name-counter">%{count}</span> karakter kaldı'
         header: En fazla 2MB olacak şekilde PNG, GIF veya JPG formatında yükleyiniz. 700x335px büyüklüğüne indirgenecektir.
         locked: Takipçilerinizi manuel olarak kabul etmenizi ve gönderilerinizi varsayılan olarak sadece takipçilerinizin göreceği şekilde paylaşmanızı sağlar.
-        note: '%{count} karakter kaldı'
+        note: '<span class="note-counter">%{count}</span> karakter kaldı'
       imports:
         data: Diğer Mastodon sunucusundan dışarı aktardığınız CSV dosyası
       sessions:
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index 3ec81f0acc..16608c1296 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -4,10 +4,10 @@ uk:
     hints:
       defaults:
         avatar: PNG, GIF, або JPG. Максимум - 2МБ. Буде зменшено до 120x120px
-        display_name: 'Залишилося символів: %{count}'
+        display_name: 'Залишилося символів: <span class="name-counter">%{count}</span>'
         header: PNG, GIF, або JPG. Максимум - 2МБ. Буде зменшено до 700x335px
         locked: Буде вимагати від Вас самостійного підтверждення підписників, змінить приватність постів за замовчуванням на "тільки для підписників"
-        note: 'Осталось символов: %{count}'
+        note: 'Осталось символов: <span class="note-counter">%{count}</span>'
       imports:
         data: Файл CSV, экспортированный с другого узла Mastodon
       sessions: