diff --git a/bookwyrm/templates/preferences/blocks.html b/bookwyrm/templates/preferences/blocks.html
index 24866fa3..699bfb7e 100644
--- a/bookwyrm/templates/preferences/blocks.html
+++ b/bookwyrm/templates/preferences/blocks.html
@@ -1,4 +1,4 @@
-{% extends 'preferences/preferences_layout.html' %}
+{% extends 'preferences/layout.html' %}
 {% load i18n %}
 
 {% block title %}{% trans "Blocked Users" %}{{ author.name }}{% endblock %}
diff --git a/bookwyrm/templates/preferences/change_password.html b/bookwyrm/templates/preferences/change_password.html
index 9f5b7e8b..f6f1be09 100644
--- a/bookwyrm/templates/preferences/change_password.html
+++ b/bookwyrm/templates/preferences/change_password.html
@@ -1,4 +1,4 @@
-{% extends 'preferences/preferences_layout.html' %}
+{% extends 'preferences/layout.html' %}
 {% load i18n %}
 
 {% block title %}{% trans "Change Password" %}{% endblock %}
diff --git a/bookwyrm/templates/preferences/delete_account.html b/bookwyrm/templates/preferences/delete_account.html
new file mode 100644
index 00000000..fe917547
--- /dev/null
+++ b/bookwyrm/templates/preferences/delete_account.html
@@ -0,0 +1,27 @@
+{% extends 'preferences/layout.html' %}
+{% load i18n %}
+
+{% block title %}{% trans "Delete Account" %}{% endblock %}
+
+{% block header %}
+{% trans "Delete Account" %}
+{% endblock %}
+
+{% block panel %}
+{% if form.non_field_errors %}
+<p class="notification is-danger">{{ form.non_field_errors }}</p>
+{% endif %}
+<div class="block">
+    <h2 class="title is-4">{% trans "Permanently delete account" %}</h2>
+    <p class="help">{% trans "Deleting your account cannot be undone. The username will not be available to register in the future." %}</p>
+
+    <form name="delete-account" action="/delete-account" method="post">
+        <div class="field">
+            <label class="label" for="id_password">{% trans "Confirm password" %}</label>
+            <input class="input" type="password" name="password" id="id_password">
+        </div>
+        <button type="submit" class="is-danger">Delete</button>
+    </form>
+</div>
+{% endblock %}
+
diff --git a/bookwyrm/templates/preferences/edit_user.html b/bookwyrm/templates/preferences/edit_user.html
index 597a8ef0..33ca0704 100644
--- a/bookwyrm/templates/preferences/edit_user.html
+++ b/bookwyrm/templates/preferences/edit_user.html
@@ -1,4 +1,4 @@
-{% extends 'preferences/preferences_layout.html' %}
+{% extends 'preferences/layout.html' %}
 {% load i18n %}
 
 {% block title %}{% trans "Edit Profile" %}{% endblock %}
@@ -69,4 +69,3 @@
     </div>
     <div class="block"><button class="button is-primary" type="submit">{% trans "Save" %}</button></div>
 </form>
-{% endblock %}
diff --git a/bookwyrm/templates/preferences/preferences_layout.html b/bookwyrm/templates/preferences/layout.html
similarity index 84%
rename from bookwyrm/templates/preferences/preferences_layout.html
rename to bookwyrm/templates/preferences/layout.html
index baf87e47..758be9e5 100644
--- a/bookwyrm/templates/preferences/preferences_layout.html
+++ b/bookwyrm/templates/preferences/layout.html
@@ -18,6 +18,10 @@
                 {% url 'prefs-password' as url %}
                 <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Change Password" %}</a>
             </li>
+            <li>
+                {% url 'prefs-delete' as url %}
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Delete Account" %}</a>
+            </li>
         </ul>
         <h2 class="menu-label">{% trans "Relationships" %}</h2>
         <ul class="menu-list">
diff --git a/bookwyrm/tests/views/test_edit_user.py b/bookwyrm/tests/views/test_edit_user.py
new file mode 100644
index 00000000..64aa139d
--- /dev/null
+++ b/bookwyrm/tests/views/test_edit_user.py
@@ -0,0 +1,110 @@
+""" test for app action functionality """
+import pathlib
+from unittest.mock import patch
+from PIL import Image
+
+from django.contrib.auth.models import AnonymousUser
+from django.core.files.base import ContentFile
+from django.core.files.uploadedfile import SimpleUploadedFile
+from django.template.response import TemplateResponse
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import forms, models, views
+
+
+class EditUserViews(TestCase):
+    """view user and edit profile"""
+
+    def setUp(self):
+        """we need basic test data and mocks"""
+        self.factory = RequestFactory()
+        self.local_user = models.User.objects.create_user(
+            "mouse@local.com",
+            "mouse@mouse.mouse",
+            "password",
+            local=True,
+            localname="mouse",
+        )
+        self.rat = models.User.objects.create_user(
+            "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat"
+        )
+        self.book = models.Edition.objects.create(title="test")
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            models.ShelfBook.objects.create(
+                book=self.book,
+                user=self.local_user,
+                shelf=self.local_user.shelf_set.first(),
+            )
+
+        models.SiteSettings.objects.create()
+        self.anonymous_user = AnonymousUser
+        self.anonymous_user.is_authenticated = False
+
+    def test_edit_user_page(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.EditUser.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        result = view(request)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+
+    def test_edit_user(self):
+        """use a form to update a user"""
+        view = views.EditUser.as_view()
+        form = forms.EditUserForm(instance=self.local_user)
+        form.data["name"] = "New Name"
+        form.data["email"] = "wow@email.com"
+        form.data["preferred_timezone"] = "UTC"
+        request = self.factory.post("", form.data)
+        request.user = self.local_user
+
+        self.assertIsNone(self.local_user.name)
+        with patch(
+            "bookwyrm.models.activitypub_mixin.broadcast_task.delay"
+        ) as delay_mock:
+            view(request)
+            self.assertEqual(delay_mock.call_count, 1)
+        self.assertEqual(self.local_user.name, "New Name")
+        self.assertEqual(self.local_user.email, "wow@email.com")
+
+    def test_edit_user_avatar(self):
+        """use a form to update a user"""
+        view = views.EditUser.as_view()
+        form = forms.EditUserForm(instance=self.local_user)
+        form.data["name"] = "New Name"
+        form.data["email"] = "wow@email.com"
+        form.data["preferred_timezone"] = "UTC"
+        image_file = pathlib.Path(__file__).parent.joinpath(
+            "../../static/images/no_cover.jpg"
+        )
+        form.data["avatar"] = SimpleUploadedFile(
+            image_file, open(image_file, "rb").read(), content_type="image/jpeg"
+        )
+        request = self.factory.post("", form.data)
+        request.user = self.local_user
+
+        with patch(
+            "bookwyrm.models.activitypub_mixin.broadcast_task.delay"
+        ) as delay_mock:
+            view(request)
+            self.assertEqual(delay_mock.call_count, 1)
+        self.assertEqual(self.local_user.name, "New Name")
+        self.assertEqual(self.local_user.email, "wow@email.com")
+        self.assertIsNotNone(self.local_user.avatar)
+        self.assertEqual(self.local_user.avatar.width, 120)
+        self.assertEqual(self.local_user.avatar.height, 120)
+
+    def test_crop_avatar(self):
+        """reduce that image size"""
+        image_file = pathlib.Path(__file__).parent.joinpath(
+            "../../static/images/no_cover.jpg"
+        )
+        image = Image.open(image_file)
+
+        result = views.user.crop_avatar(image)
+        self.assertIsInstance(result, ContentFile)
+        image_result = Image.open(result)
+        self.assertEqual(image_result.size, (120, 120))
diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py
index 3fa78e35..478d2e8f 100644
--- a/bookwyrm/tests/views/test_user.py
+++ b/bookwyrm/tests/views/test_user.py
@@ -1,17 +1,13 @@
 """ test for app action functionality """
-import pathlib
 from unittest.mock import patch
-from PIL import Image
 
 from django.contrib.auth.models import AnonymousUser
-from django.core.files.base import ContentFile
-from django.core.files.uploadedfile import SimpleUploadedFile
 from django.http.response import Http404
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
 
-from bookwyrm import forms, models, views
+from bookwyrm import models, views
 from bookwyrm.activitypub import ActivitypubResponse
 
 
@@ -137,71 +133,3 @@ class UserViews(TestCase):
             is_api.return_value = False
             with self.assertRaises(Http404):
                 view(request, "rat")
-
-    def test_edit_user_page(self):
-        """there are so many views, this just makes sure it LOADS"""
-        view = views.EditUser.as_view()
-        request = self.factory.get("")
-        request.user = self.local_user
-        result = view(request)
-        self.assertIsInstance(result, TemplateResponse)
-        result.render()
-        self.assertEqual(result.status_code, 200)
-
-    def test_edit_user(self):
-        """use a form to update a user"""
-        view = views.EditUser.as_view()
-        form = forms.EditUserForm(instance=self.local_user)
-        form.data["name"] = "New Name"
-        form.data["email"] = "wow@email.com"
-        form.data["preferred_timezone"] = "UTC"
-        request = self.factory.post("", form.data)
-        request.user = self.local_user
-
-        self.assertIsNone(self.local_user.name)
-        with patch(
-            "bookwyrm.models.activitypub_mixin.broadcast_task.delay"
-        ) as delay_mock:
-            view(request)
-            self.assertEqual(delay_mock.call_count, 1)
-        self.assertEqual(self.local_user.name, "New Name")
-        self.assertEqual(self.local_user.email, "wow@email.com")
-
-    def test_edit_user_avatar(self):
-        """use a form to update a user"""
-        view = views.EditUser.as_view()
-        form = forms.EditUserForm(instance=self.local_user)
-        form.data["name"] = "New Name"
-        form.data["email"] = "wow@email.com"
-        form.data["preferred_timezone"] = "UTC"
-        image_file = pathlib.Path(__file__).parent.joinpath(
-            "../../static/images/no_cover.jpg"
-        )
-        form.data["avatar"] = SimpleUploadedFile(
-            image_file, open(image_file, "rb").read(), content_type="image/jpeg"
-        )
-        request = self.factory.post("", form.data)
-        request.user = self.local_user
-
-        with patch(
-            "bookwyrm.models.activitypub_mixin.broadcast_task.delay"
-        ) as delay_mock:
-            view(request)
-            self.assertEqual(delay_mock.call_count, 1)
-        self.assertEqual(self.local_user.name, "New Name")
-        self.assertEqual(self.local_user.email, "wow@email.com")
-        self.assertIsNotNone(self.local_user.avatar)
-        self.assertEqual(self.local_user.avatar.width, 120)
-        self.assertEqual(self.local_user.avatar.height, 120)
-
-    def test_crop_avatar(self):
-        """reduce that image size"""
-        image_file = pathlib.Path(__file__).parent.joinpath(
-            "../../static/images/no_cover.jpg"
-        )
-        image = Image.open(image_file)
-
-        result = views.user.crop_avatar(image)
-        self.assertIsInstance(result, ContentFile)
-        image_result = Image.open(result)
-        self.assertEqual(image_result.size, (120, 120))
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 6d70ee1e..a027ed5f 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -253,6 +253,7 @@ urlpatterns = [
         views.ChangePassword.as_view(),
         name="prefs-password",
     ),
+    re_path(r"^preferences/delete/?$", views.DeleteAccount.as_view(), name="prefs-delete"),
     re_path(r"^preferences/block/?$", views.Block.as_view(), name="prefs-block"),
     re_path(r"^block/(?P<user_id>\d+)/?$", views.Block.as_view()),
     re_path(r"^unblock/(?P<user_id>\d+)/?$", views.unblock),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 486b99ed..7beff831 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -6,6 +6,7 @@ from .block import Block, unblock
 from .books import Book, EditBook, ConfirmEditBook, Editions
 from .books import upload_cover, add_description, switch_edition, resolve_book
 from .directory import Directory
+from .edit_user import EditUser
 from .federation import Federation, FederatedServer
 from .federation import AddFederatedServer, ImportServerBlocklist
 from .federation import block_server, unblock_server
@@ -37,6 +38,6 @@ from .shelf import shelve, unshelve
 from .site import Site
 from .status import CreateStatus, DeleteStatus, DeleteAndRedraft
 from .updates import get_notification_count, get_unread_status_count
-from .user import User, EditUser, Followers, Following
+from .user import User, Followers, Following
 from .user_admin import UserAdmin, UserAdminList
 from .wellknown import *
diff --git a/bookwyrm/views/edit_user.py b/bookwyrm/views/edit_user.py
new file mode 100644
index 00000000..43b7018c
--- /dev/null
+++ b/bookwyrm/views/edit_user.py
@@ -0,0 +1,82 @@
+""" edit or delete ones own account"""
+from io import BytesIO
+from uuid import uuid4
+from PIL import Image
+
+from django.contrib.auth.decorators import login_required
+from django.core.files.base import ContentFile
+from django.shortcuts import redirect
+from django.template.response import TemplateResponse
+from django.utils.decorators import method_decorator
+from django.views import View
+
+from bookwyrm import forms
+
+
+# pylint: disable=no-self-use
+@method_decorator(login_required, name="dispatch")
+class EditUser(View):
+    """edit user view"""
+
+    def get(self, request):
+        """edit profile page for a user"""
+        data = {
+            "form": forms.EditUserForm(instance=request.user),
+            "user": request.user,
+        }
+        return TemplateResponse(request, "preferences/edit_user.html", data)
+
+    def post(self, request):
+        """les get fancy with images"""
+        form = forms.EditUserForm(request.POST, request.FILES, instance=request.user)
+        if not form.is_valid():
+            data = {"form": form, "user": request.user}
+            return TemplateResponse(request, "preferences/edit_user.html", data)
+
+        user = save_user_form(form)
+
+        return redirect(user.local_path)
+
+
+def save_user_form(form):
+    """special handling for the user form"""
+    user = form.save(commit=False)
+
+    if "avatar" in form.files:
+        # crop and resize avatar upload
+        image = Image.open(form.files["avatar"])
+        image = crop_avatar(image)
+
+        # set the name to a hash
+        extension = form.files["avatar"].name.split(".")[-1]
+        filename = "%s.%s" % (uuid4(), extension)
+        user.avatar.save(filename, image, save=False)
+    user.save()
+    return user
+
+
+def crop_avatar(image):
+    """reduce the size and make an avatar square"""
+    target_size = 120
+    width, height = image.size
+    thumbnail_scale = (
+        height / (width / target_size)
+        if height > width
+        else width / (height / target_size)
+    )
+    image.thumbnail([thumbnail_scale, thumbnail_scale])
+    width, height = image.size
+
+    width_diff = width - target_size
+    height_diff = height - target_size
+    cropped = image.crop(
+        (
+            int(width_diff / 2),
+            int(height_diff / 2),
+            int(width - (width_diff / 2)),
+            int(height - (height_diff / 2)),
+        )
+    )
+    output = BytesIO()
+    cropped.save(output, format=image.format)
+    return ContentFile(output.getvalue())
diff --git a/bookwyrm/views/get_started.py b/bookwyrm/views/get_started.py
index 7eae9483..7f615172 100644
--- a/bookwyrm/views/get_started.py
+++ b/bookwyrm/views/get_started.py
@@ -14,7 +14,7 @@ from django.views import View
 from bookwyrm import forms, models
 from bookwyrm.connectors import connector_manager
 from .helpers import get_suggested_users
-from .user import save_user_form
+from .edit_user import save_user_form
 
 
 # pylint: disable= no-self-use
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index d186fe97..f62913a9 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -1,25 +1,17 @@
 """ non-interactive pages """
-from io import BytesIO
-from uuid import uuid4
-from PIL import Image
-
-from django.contrib.auth.decorators import login_required
-from django.core.files.base import ContentFile
 from django.core.paginator import Paginator
-from django.shortcuts import redirect
 from django.template.response import TemplateResponse
 from django.utils import timezone
-from django.utils.decorators import method_decorator
 from django.views import View
 
-from bookwyrm import forms, models
+from bookwyrm import models
 from bookwyrm.activitypub import ActivitypubResponse
 from bookwyrm.settings import PAGE_LENGTH
 from .helpers import get_user_from_username, is_api_request
 from .helpers import privacy_filter
 
 
-# pylint: disable= no-self-use
+# pylint: disable=no-self-use
 class User(View):
     """user profile page"""
 
@@ -122,71 +114,3 @@ class Following(View):
             "follow_list": paginated.get_page(request.GET.get("page")),
         }
         return TemplateResponse(request, "user/relationships/following.html", data)
-
-
-@method_decorator(login_required, name="dispatch")
-class EditUser(View):
-    """edit user view"""
-
-    def get(self, request):
-        """edit profile page for a user"""
-        data = {
-            "form": forms.EditUserForm(instance=request.user),
-            "user": request.user,
-        }
-        return TemplateResponse(request, "preferences/edit_user.html", data)
-
-    def post(self, request):
-        """les get fancy with images"""
-        form = forms.EditUserForm(request.POST, request.FILES, instance=request.user)
-        if not form.is_valid():
-            data = {"form": form, "user": request.user}
-            return TemplateResponse(request, "preferences/edit_user.html", data)
-
-        user = save_user_form(form)
-
-        return redirect(user.local_path)
-
-
-def save_user_form(form):
-    """special handling for the user form"""
-    user = form.save(commit=False)
-
-    if "avatar" in form.files:
-        # crop and resize avatar upload
-        image = Image.open(form.files["avatar"])
-        image = crop_avatar(image)
-
-        # set the name to a hash
-        extension = form.files["avatar"].name.split(".")[-1]
-        filename = "%s.%s" % (uuid4(), extension)
-        user.avatar.save(filename, image, save=False)
-    user.save()
-    return user
-
-
-def crop_avatar(image):
-    """reduce the size and make an avatar square"""
-    target_size = 120
-    width, height = image.size
-    thumbnail_scale = (
-        height / (width / target_size)
-        if height > width
-        else width / (height / target_size)
-    )
-    image.thumbnail([thumbnail_scale, thumbnail_scale])
-    width, height = image.size
-
-    width_diff = width - target_size
-    height_diff = height - target_size
-    cropped = image.crop(
-        (
-            int(width_diff / 2),
-            int(height_diff / 2),
-            int(width - (width_diff / 2)),
-            int(height - (height_diff / 2)),
-        )
-    )
-    output = BytesIO()
-    cropped.save(output, format=image.format)
-    return ContentFile(output.getvalue())