diff --git a/tests.py b/tests.py
index da405f63c..acfd41a7c 100644
--- a/tests.py
+++ b/tests.py
@@ -6202,7 +6202,6 @@ def _test_functions():
         'run_posts_watchdog',
         'run_shares_expire_watchdog',
         'get_this_weeks_events',
-        'get_availability',
         '_test_threads_function',
         'create_server_group',
         'create_server_alice',
diff --git a/translations/ar.json b/translations/ar.json
index 02d17a6b9..b3dd15ecd 100644
--- a/translations/ar.json
+++ b/translations/ar.json
@@ -768,5 +768,6 @@
 	"Show Map": "عرض الخريطة",
 	"Organisation": "منظمة",
 	"Group": "مجموعة",
-	"minutes": "دقائق"
+	"minutes": "دقائق",
+	"Availability": "التوافر"
 }
diff --git a/translations/bn.json b/translations/bn.json
index 7d887d6f7..cd97c1a04 100644
--- a/translations/bn.json
+++ b/translations/bn.json
@@ -768,5 +768,6 @@
 	"Show Map": "মানচিত্র দেখান",
 	"Organisation": "সংগঠন",
 	"Group": "গ্রুপ",
-	"minutes": "মিনিট"
+	"minutes": "মিনিট",
+	"Availability": "প্রাপ্যতা"
 }
diff --git a/translations/ca.json b/translations/ca.json
index c76c5e672..1d0bbc839 100644
--- a/translations/ca.json
+++ b/translations/ca.json
@@ -768,5 +768,6 @@
 	"Show Map": "Mostra el mapa",
 	"Organisation": "Organització",
 	"Group": "Grup",
-	"minutes": "minuts"
+	"minutes": "minuts",
+	"Availability": "Disponibilitat"
 }
diff --git a/translations/cy.json b/translations/cy.json
index 8597fd7c1..9185fb027 100644
--- a/translations/cy.json
+++ b/translations/cy.json
@@ -768,5 +768,6 @@
 	"Show Map": "Dangos Map",
 	"Organisation": "Sefydliad",
 	"Group": "Grŵp",
-	"minutes": "munudau"
+	"minutes": "munudau",
+	"Availability": "Argaeledd"
 }
diff --git a/translations/de.json b/translations/de.json
index 59adbf3c0..ec03baf09 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -768,5 +768,6 @@
 	"Show Map": "Karte anzeigen",
 	"Organisation": "Organisation",
 	"Group": "Gruppe",
-	"minutes": "minuten"
+	"minutes": "minuten",
+	"Availability": "Verfügbarkeit"
 }
diff --git a/translations/el.json b/translations/el.json
index c60082072..290ab45b1 100644
--- a/translations/el.json
+++ b/translations/el.json
@@ -768,5 +768,6 @@
 	"Show Map": "Εμφάνιση Χάρτη",
 	"Organisation": "Οργάνωση",
 	"Group": "Ομάδα",
-	"minutes": "πρακτικά"
+	"minutes": "πρακτικά",
+	"Availability": "Διαθεσιμότητα"
 }
diff --git a/translations/en.json b/translations/en.json
index 9fe103c70..d7a0b5b44 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -768,5 +768,6 @@
 	"Show Map": "Show Map",
 	"Organisation": "Organisation",
 	"Group": "Group",
-	"minutes": "minutes"
+	"minutes": "minutes",
+	"Availability": "Availability"
 }
diff --git a/translations/es.json b/translations/es.json
index bda2d4598..bee8752a5 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -768,5 +768,6 @@
 	"Show Map": "Mostrar mapa",
 	"Organisation": "Organización",
 	"Group": "Grupo",
-	"minutes": "minutos"
+	"minutes": "minutos",
+	"Availability": "Disponibilidad"
 }
diff --git a/translations/fa.json b/translations/fa.json
index 0147eb427..55855f356 100644
--- a/translations/fa.json
+++ b/translations/fa.json
@@ -768,5 +768,6 @@
 	"Show Map": "نمایش نقشه",
 	"Organisation": "سازمان",
 	"Group": "گروه",
-	"minutes": "دقیقه"
+	"minutes": "دقیقه",
+	"Availability": "در دسترس بودن"
 }
diff --git a/translations/fi.json b/translations/fi.json
index e9db2e683..05208b1ff 100644
--- a/translations/fi.json
+++ b/translations/fi.json
@@ -768,5 +768,6 @@
 	"Show Map": "Näytä kartta",
 	"Organisation": "Organisaatio",
 	"Group": "Ryhmä",
-	"minutes": "minuuttia"
+	"minutes": "minuuttia",
+	"Availability": "Saatavuus"
 }
diff --git a/translations/fr.json b/translations/fr.json
index 3b40ccc23..d0a38704c 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -768,5 +768,6 @@
 	"Show Map": "Afficher la carte",
 	"Organisation": "Organisation",
 	"Group": "Groupe",
-	"minutes": "minutes"
+	"minutes": "minutes",
+	"Availability": "Disponibilité"
 }
diff --git a/translations/ga.json b/translations/ga.json
index 34db01505..9c42a73f3 100644
--- a/translations/ga.json
+++ b/translations/ga.json
@@ -768,5 +768,6 @@
 	"Show Map": "Taispeáin Léarscáil",
 	"Organisation": "Eagraíocht",
 	"Group": "Grúpa",
-	"minutes": "nóiméad"
+	"minutes": "nóiméad",
+	"Availability": "Infhaighteacht"
 }
diff --git a/translations/he.json b/translations/he.json
index 7e3c69b67..7ee38feb1 100644
--- a/translations/he.json
+++ b/translations/he.json
@@ -768,5 +768,6 @@
 	"Show Map": "הצג מפה",
 	"Organisation": "אִרגוּן",
 	"Group": "קְבוּצָה",
-	"minutes": "פּרוֹטוֹקוֹל"
+	"minutes": "פּרוֹטוֹקוֹל",
+	"Availability": "זְמִינוּת"
 }
diff --git a/translations/hi.json b/translations/hi.json
index 236bab874..8e1fab7ae 100644
--- a/translations/hi.json
+++ b/translations/hi.json
@@ -768,5 +768,6 @@
 	"Show Map": "नक्शा दिखाएं",
 	"Organisation": "संगठन",
 	"Group": "समूह",
-	"minutes": "मिनट"
+	"minutes": "मिनट",
+	"Availability": "उपलब्धता"
 }
diff --git a/translations/it.json b/translations/it.json
index 65b787017..473138455 100644
--- a/translations/it.json
+++ b/translations/it.json
@@ -768,5 +768,6 @@
 	"Show Map": "Mostra mappa",
 	"Organisation": "Organizzazione",
 	"Group": "Gruppo",
-	"minutes": "minuti"
+	"minutes": "minuti",
+	"Availability": "Disponibilità"
 }
diff --git a/translations/ja.json b/translations/ja.json
index 0bdf6a337..5c3b38b6f 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -768,5 +768,6 @@
 	"Show Map": "地図を表示",
 	"Organisation": "組織",
 	"Group": "グループ",
-	"minutes": "分"
+	"minutes": "分",
+	"Availability": "可用性"
 }
diff --git a/translations/ko.json b/translations/ko.json
index 8aa909970..3e484bc97 100644
--- a/translations/ko.json
+++ b/translations/ko.json
@@ -768,5 +768,6 @@
 	"Show Map": "지도 표시",
 	"Organisation": "조직",
 	"Group": "그룹",
-	"minutes": "분"
+	"minutes": "분",
+	"Availability": "유효성"
 }
diff --git a/translations/ku.json b/translations/ku.json
index 5117270ef..13ae2b1eb 100644
--- a/translations/ku.json
+++ b/translations/ku.json
@@ -768,5 +768,6 @@
 	"Show Map": "Nexşeya Nîşan Bide",
 	"Organisation": "Sazûman",
 	"Group": "Kom",
-	"minutes": "deqîqe"
+	"minutes": "deqîqe",
+	"Availability": "Berdestbûnî"
 }
diff --git a/translations/nl.json b/translations/nl.json
index 02a1fa5da..2428dd06d 100644
--- a/translations/nl.json
+++ b/translations/nl.json
@@ -768,5 +768,6 @@
 	"Show Map": "Kaart weergeven",
 	"Organisation": "Organisatie",
 	"Group": "Groep",
-	"minutes": "notulen"
+	"minutes": "notulen",
+	"Availability": "Beschikbaarheid"
 }
diff --git a/translations/oc.json b/translations/oc.json
index 17ca6875c..a3c868b07 100644
--- a/translations/oc.json
+++ b/translations/oc.json
@@ -764,5 +764,6 @@
 	"Show Map": "Show Map",
 	"Organisation": "Organisation",
 	"Group": "Group",
-	"minutes": "minutes"
+	"minutes": "minutes",
+	"Availability": "Availability"
 }
diff --git a/translations/pl.json b/translations/pl.json
index 63c9ee35e..3b5d9ee13 100644
--- a/translations/pl.json
+++ b/translations/pl.json
@@ -768,5 +768,6 @@
 	"Show Map": "Pokaż mapę",
 	"Organisation": "Organizacja",
 	"Group": "Grupa",
-	"minutes": "protokół"
+	"minutes": "protokół",
+	"Availability": "Dostępność"
 }
diff --git a/translations/pt.json b/translations/pt.json
index 0bbb0919a..d5c9a2c6b 100644
--- a/translations/pt.json
+++ b/translations/pt.json
@@ -768,5 +768,6 @@
 	"Show Map": "Mostrar mapa",
 	"Organisation": "Organização",
 	"Group": "Grupo",
-	"minutes": "minutos"
+	"minutes": "minutos",
+	"Availability": "Disponibilidade"
 }
diff --git a/translations/ru.json b/translations/ru.json
index 4cf812b50..153ca506f 100644
--- a/translations/ru.json
+++ b/translations/ru.json
@@ -768,5 +768,6 @@
 	"Show Map": "Показать карту",
 	"Organisation": "Организация",
 	"Group": "Группа",
-	"minutes": "минут"
+	"minutes": "минут",
+	"Availability": "Доступность"
 }
diff --git a/translations/sw.json b/translations/sw.json
index 99e6ea321..860490062 100644
--- a/translations/sw.json
+++ b/translations/sw.json
@@ -768,5 +768,6 @@
 	"Show Map": "Onyesha Ramani",
 	"Organisation": "Shirika",
 	"Group": "Kundi",
-	"minutes": "dakika"
+	"minutes": "dakika",
+	"Availability": "Upatikanaji"
 }
diff --git a/translations/tr.json b/translations/tr.json
index 7ab7e0c1a..04e5bd3c8 100644
--- a/translations/tr.json
+++ b/translations/tr.json
@@ -768,5 +768,6 @@
 	"Show Map": "Haritayı Göster",
 	"Organisation": "Organizasyon",
 	"Group": "Grup",
-	"minutes": "dakika"
+	"minutes": "dakika",
+	"Availability": "Müsaitlik"
 }
diff --git a/translations/uk.json b/translations/uk.json
index a8609dde8..bad37f33f 100644
--- a/translations/uk.json
+++ b/translations/uk.json
@@ -768,5 +768,6 @@
 	"Show Map": "Показати карту",
 	"Organisation": "Організація",
 	"Group": "Група",
-	"minutes": "хвилин"
+	"minutes": "хвилин",
+	"Availability": "Наявність"
 }
diff --git a/translations/yi.json b/translations/yi.json
index 48ff2fa6c..699eb749a 100644
--- a/translations/yi.json
+++ b/translations/yi.json
@@ -768,5 +768,6 @@
 	"Show Map": "ווייַזן מאַפּע",
 	"Organisation": "אָרגאַניזאַציע",
 	"Group": "גרופּע",
-	"minutes": "מינוטן"
+	"minutes": "מינוטן",
+	"Availability": "פאַראַנען"
 }
diff --git a/translations/zh.json b/translations/zh.json
index f45514934..3384131bd 100644
--- a/translations/zh.json
+++ b/translations/zh.json
@@ -768,5 +768,6 @@
 	"Show Map": "显示地图",
 	"Organisation": "组织",
 	"Group": "团体",
-	"minutes": "分钟"
+	"minutes": "分钟",
+	"Availability": "可用性"
 }
diff --git a/webapp_person_options.py b/webapp_person_options.py
index a004ef81d..5b6ee09e6 100644
--- a/webapp_person_options.py
+++ b/webapp_person_options.py
@@ -41,6 +41,7 @@ from webapp_utils import html_hide_from_screen_reader
 from webapp_utils import minimizing_attached_images
 from blocking import allowed_announce
 from filters import is_filtered
+from availability import get_availability
 
 
 def _minimize_attached_images(base_dir: str, nickname: str, domain: str,
@@ -329,6 +330,12 @@ def html_person_options(default_timeline: str,
         '  <p class="optionsText">' + translate['Options for'] + \
         ' @' + handle_shown + mitm_str + '</p>\n'
 
+    available = get_availability(base_dir, nickname, domain, options_actor)
+    if available:
+        options_str += \
+            '  <p class="optionsText">' + translate['Availability'] + \
+            ': ' + remove_html(available).title() + '</p>\n'
+
     # is sending posts to this account blocked?
     if sending_is_blocked2(base_dir, nickname, domain,
                            options_domain, options_actor):