diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 9acd4a27261ef58b972e761735f3e5082c7807b4..58f3bf2475686994a32377f574c653f21353cf61 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -13,6 +13,7 @@ Fixed
 ~~~~~
 
 * Signup was forbidden even if it was enabled in settings
+* Phone numbers were not properly linked and suboptimally formatted on person page
 
 `2.6`_ - 2022-01-10
 -------------------
diff --git a/aleksis/core/templates/core/person/full.html b/aleksis/core/templates/core/person/full.html
index 749ba164229845057c965e4efd3e8d0fb9423f32..905386b2a42b0805c7057df1e8e5d7ca6766c87b 100644
--- a/aleksis/core/templates/core/person/full.html
+++ b/aleksis/core/templates/core/person/full.html
@@ -164,14 +164,20 @@
               <i class="material-icons small">phone</i>
             </td>
             <td>
-              <a href="tel:{{ person.phone_number }}">{{ person.phone_number }}</a>
-              <small>({% trans "home number" %})</small>
+              {% if person.mobile_number %}
+                <a href="{{ person.mobile_number.as_rfc3966 }}">{{ person.mobile_number.as_international }}</a>
+              {% else %}
+                –
+              {% endif %}
+              <small>({% trans "mobile number" %})</small>
             </td>
           </tr>
           <tr>
             <td>
-              <a href="tel:{{ person.phone_number }}">{{ person.mobile_number }}</a>
-              <small>({% trans "mobile number" %})</small>
+              {% if person.mobile_number %}
+                <a href="{{ person.mobile_number.as_rfc3966 }}">{{ person.mobile_number.as_international }}</a>
+                <small>({% trans "mobile number" %})</small>
+              {% endif %}
             </td>
           </tr>
           <tr>