diff --git a/map/templates/map/change_location.html b/map/templates/map/change_location.html
index 67cf23d..cd0ff45 100644
--- a/map/templates/map/change_location.html
+++ b/map/templates/map/change_location.html
@@ -6,18 +6,18 @@
 {% block content %}
     <div class="alert alert-info">
         <h4 class="alert-heading">Notice</h4>
-        <p>
+        <div>
             You can find the GPS coordinates of your place with
             <a class="alert-link" href="https://www.openstreetmap.org">OpenStreetMap</a>
             (right click, show address, and the coordinates are displayed in the left panel).
-        </p>
+        </div>
         <hr>
-        <p>
+        <div>
             The precision of the GPS coordinates is at your own discretion. Please note that they will be stored
             directly in the database in order to be displayed to other users.
             If you want to protect your privacy, you are advised to choose a location at the center of a large city near
             you.
-        </p>
+        </div>
     </div>
     <form method="post">
         {% csrf_token %}
diff --git a/map/templates/map/change_profile.html b/map/templates/map/change_profile.html
index 572bbe9..8e33d6c 100644
--- a/map/templates/map/change_profile.html
+++ b/map/templates/map/change_profile.html
@@ -4,10 +4,29 @@
 {% block h1 %}Change your profile{% endblock %}
 
 {% block content %}
+    <div class="alert alert-info">
+        <h4 class="alert-heading">Notice</h4>
+        <div>
+            The only required field is your username, which you can customize nearly freely.
+            If you choose to add your first and last name, they will be displayed on the map and on the right of the
+            navbar, at the top. If you don't, your username will be displayed instead.
+            <br>
+            Your email address will only ever be used to communicate account-related information. It will never be sold
+            or used to spam you. You can choose not to communicate your email address.
+        </div>
+        <hr>
+        <div>
+            You can also permanently delete your profile using the button at the bottom of this page.
+            This will prompt you for confirmation about <strong>permanently</strong> and <strong>immediately</strong>
+            deleting your profile, meaning that we will not be able to retrieve
+            your data if you change your mind.
+        </div>
+    </div>
     <form method="post">
         {% csrf_token %}
         {{ form|crispy }}
         <button type="submit" class="btn btn-primary">Save</button>
+        <a href="{% url 'password_change' %}" class="btn btn-secondary">Change your password</a>
         <a href="{% url 'delete-profile' %}" class="btn btn-warning">Permanently delete your profile</a>
     </form>
 {% endblock %}
diff --git a/map/templates/map/delete_location.html b/map/templates/map/delete_location.html
index 1249804..ec29607 100644
--- a/map/templates/map/delete_location.html
+++ b/map/templates/map/delete_location.html
@@ -6,10 +6,10 @@
 {% block content %}
     <div class="alert alert-warning">
         <h4 class="alert-heading">Are you sure?</h4>
-        <p>
+        <div>
             Are you sure you want to delete your location ? This can't be undone,
             though you will be able to add it again in the future.
-        </p>
+        </div>
     </div>
     <form method="post">
         {% csrf_token %}
diff --git a/map/templates/map/delete_profile.html b/map/templates/map/delete_profile.html
index e004e63..010ebbe 100644
--- a/map/templates/map/delete_profile.html
+++ b/map/templates/map/delete_profile.html
@@ -6,10 +6,10 @@
 {% block content %}
     <div class="alert alert-danger">
         <h4 class="alert-heading">Are you sure?</h4>
-        <p>
-            Are you sure you want to delete your profile ? You will permanently lose access to this service.
-            This can't be undone.
-        </p>
+        <div>
+            Are you sure you want to delete your profile ? You will permanently lose access to this service.<br>
+            This is immediate and can't be undone.
+        </div>
     </div>
     <form method="post">
         {% csrf_token %}