diff --git a/bookwyrm/templates/edit_user.html b/bookwyrm/templates/edit_user.html
index 7e963b5b..413f2cae 100644
--- a/bookwyrm/templates/edit_user.html
+++ b/bookwyrm/templates/edit_user.html
@@ -8,40 +8,40 @@
         {% endif %}
         <form name="edit-profile" action="/edit-profile/" method="post" enctype="multipart/form-data">
             {% csrf_token %}
-            <p class="block">
+            <div class="block">
                 <label class="label" for="id_avatar">Avatar:</label>
                 {{ form.avatar }}
                 {% for error in form.avatar.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
-            </p>
-            <p class="block">
+            </div>
+            <div class="block">
                 <label class="label" for="id_name">Display name:</label>
                 {{ form.name }}
                 {% for error in form.name.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
-            </p>
-            <p class="block">
+            </div>
+            <div class="block">
                 <label class="label" for="id_summary">Summary:</label>
                 {{ form.summary }}
                 {% for error in form.summary.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
-            </p>
-            <p class="block">
+            </div>
+            <div class="block">
                 <label class="label" for="id_email">Email address:</label>
                 {{ form.email }}
                 {% for error in form.email.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
-            </p>
-            <p class="block">
+            </div>
+            <div class="block">
                 <label class="checkbox label" for="id_manually_approves_followers">
                     Manually approve followers:
                     {{ form.manually_approves_followers }}
                 </label>
-            </p>
+            </div>
             <button class="button is-primary" type="submit">Save</button>
         </form>
     </div>
@@ -50,14 +50,14 @@
             <h2 class="title">Change password</h2>
             <form name="edit-profile" action="/change-password/" method="post" enctype="multipart/form-data">
                 {% csrf_token %}
-                <p class="block">
+                <div class="block">
                     <label class="label" for="id_password">New password:</label>
                     <input type="password" name="password" maxlength="128" class="input" required="" id="id_password">
-                </p>
-                <p class="block">
+                </div>
+                <div class="block">
                     <label class="label" for="id_confirm_password">Confirm password:</label>
                     <input type="password" name="confirm-password" maxlength="128" class="input" required="" id="id_confirm_password">
-                </p>
+                </div>
                 <button class="button is-primary" type="submit">Change password</button>
             </form>
         </div>
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index aeec1864..6f7873d5 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -185,4 +185,4 @@ class EditUser(View):
         user.save()
 
         broadcast(user, user.to_update_activity(user))
-        return redirect('/user/%s' % request.user.localname)
+        return redirect(user.local_path)