diff --git a/bookwyrm/templates/settings/edit_server.html b/bookwyrm/templates/settings/edit_server.html
index 6510222d8..dc0de7e8c 100644
--- a/bookwyrm/templates/settings/edit_server.html
+++ b/bookwyrm/templates/settings/edit_server.html
@@ -3,14 +3,56 @@
 {% block title %}{% trans "Add server" %}{% endblock %}
 
 {% block header %}
-{% if form.server_name.value %}{{ form.server_name.value }}{% else %}{% trans "Add server" %}{% endif %}
+{% if server %}{{ server.server_name }}{% else %}{% trans "Add server" %}{% endif %}
 <a href="{% url 'settings-federation' %}" class="has-text-weight-normal help">{% trans "Back to server list" %}</a>
 {% endblock %}
 
 {% block panel %}
 
-<form method="POST" action="{% url 'settings-edit-federated-server' %}">
-    {% include 'settings/server_form.html' %}
+<form method="POST" action="{% url 'settings-edit-federated-server' server.id %}">
+    {% csrf_token %}
+    <div class="columns">
+        <div class="column is-half">
+            <div>
+                <label class="label" for="id_server_name">{% trans "Instance:" %}</label>
+                <input type="text" name="server_name" maxlength="255" class="input" required id="id_server_name" value="{{ form.server_name.value|default:'' }}" placeholder="domain.com">
+                {% for error in form.server_name.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+            </div>
+            <div>
+                <label class="label" for="id_status">{% trans "Status:" %}</label>
+                <div class="select">
+                    <select name="status" class="" id="id_status">
+                        <option value="federated" {% if form.status.value == "federated" or not form.status.value %}selected=""{% endif %}>{% trans "Federated" %}</option>
+                        <option value="blocked" {% if form.status.value == "blocked" %}selected{% endif %}>{% trans "Blocked" %}</option>
+                    </select>
+                </div>
+            </div>
+        </div>
+        <div class="column is-half">
+            <div>
+                <label class="label" for="id_application_type">{% trans "Software:" %}</label>
+                <input type="text" name="application_type" maxlength="255" class="input" id="id_application_type" value="{{ form.application_type.value|default:'' }}">
+                {% for error in form.application_type.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+            </div>
+            <div>
+                <label class="label" for="id_application_version">{% trans "Version:" %}</label>
+                <input type="text" name="application_version" maxlength="255" class="input" id="id_application_version" value="{{ form.application_version.value|default:'' }}">
+                {% for error in form.application_version.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+            </div>
+        </div>
+    </div>
+    <p>
+        <label class="label" for="id_notes">{% trans "Notes:" %}</label>
+        <textarea name="notes" cols="None" rows="None" class="textarea" id="id_notes">{{ form.notes.value|default:'' }}</textarea>
+    </p>
+
+    <button type="submit" class="button is-primary">{% trans "Save" %}</button>
 </form>
 
 {% endblock %}
diff --git a/bookwyrm/templates/settings/federated_server.html b/bookwyrm/templates/settings/federated_server.html
index 147d6514e..5b41ea797 100644
--- a/bookwyrm/templates/settings/federated_server.html
+++ b/bookwyrm/templates/settings/federated_server.html
@@ -11,6 +11,14 @@
 <a href="{% url 'settings-federation' %}" class="has-text-weight-normal help">{% trans "Back to server list" %}</a>
 {% endblock %}
 
+{% block edit-button %}
+<a href="{% url 'settings-edit-federated-server' server.id %}">
+    <span class="icon icon-pencil" title="{% trans 'Edit server' %}">
+        <span class="is-sr-only">{% trans "Edit server" %}</span>
+    </span>
+</a>
+{% endblock %}
+
 {% block panel %}
 <section class="block content">
     <h2 class="title is-4">{% trans "Details" %}</h2>
diff --git a/bookwyrm/templates/settings/server_form.html b/bookwyrm/templates/settings/server_form.html
deleted file mode 100644
index b86c3d039..000000000
--- a/bookwyrm/templates/settings/server_form.html
+++ /dev/null
@@ -1,47 +0,0 @@
-{% load i18n %}
-
-{% csrf_token %}
-<div class="columns">
-    <div class="column is-half">
-        <div>
-            <label class="label" for="id_server_name">{% trans "Instance:" %}</label>
-            <input type="text" name="server_name" maxlength="255" class="input" required id="id_server_name" value="{{ form.server_name.value|default:'' }}" placeholder="domain.com">
-            {% for error in form.server_name.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
-        </div>
-        <div>
-            <label class="label" for="id_status">{% trans "Status:" %}</label>
-            <div class="select">
-                <select name="status" class="" id="id_status">
-                    <option value="federated" {% if form.status.value == "federated" or not form.status.value %}selected=""{% endif %}>{% trans "Federated" %}</option>
-                    <option value="blocked" {% if form.status.value == "blocked" %}selected{% endif %}>{% trans "Blocked" %}</option>
-                </select>
-            </div>
-        </div>
-    </div>
-    <div class="column is-half">
-        <div>
-            <label class="label" for="id_application_type">{% trans "Software:" %}</label>
-            <input type="text" name="application_type" maxlength="255" class="input" id="id_application_type" value="{{ form.application_type.value|default:'' }}">
-            {% for error in form.application_type.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
-        </div>
-        <div>
-            <label class="label" for="id_application_version">{% trans "Version:" %}</label>
-            <input type="text" name="application_version" maxlength="255" class="input" id="id_application_version" value="{{ form.application_version.value|default:'' }}">
-            {% for error in form.application_version.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
-        </div>
-    </div>
-</div>
-<p>
-    <label class="label" for="id_notes">{% trans "Notes:" %}</label>
-    <textarea name="notes" cols="None" rows="None" class="textarea" id="id_notes">
-        {{ form.notes.value|default:'' }}
-    </textarea>
-</p>
-
-<button type="submit" class="button is-primary">{% trans "Save" %}</button>
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 35856a4d9..4cf6fd526 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -73,6 +73,11 @@ urlpatterns = [
         views.EditFederatedServer.as_view(),
         name="settings-edit-federated-server",
     ),
+    re_path(
+        r"^settings/federation/edit/(?P<server>\d+)?$",
+        views.EditFederatedServer.as_view(),
+        name="settings-edit-federated-server",
+    ),
     re_path(
         r"^settings/invites/?$", views.ManageInvites.as_view(), name="settings-invites"
     ),
diff --git a/bookwyrm/views/federation.py b/bookwyrm/views/federation.py
index bb33c5af3..09f5040d9 100644
--- a/bookwyrm/views/federation.py
+++ b/bookwyrm/views/federation.py
@@ -44,16 +44,21 @@ class Federation(View):
 class EditFederatedServer(View):
     """ manually add a server """
 
-    def get(self, request):
+    def get(self, request, server=None):
         """ add server form """
-        data = {"form": forms.ServerForm()}
+        if server:
+            server = get_object_or_404(models.FederatedServer, id=server)
+        data = {"form": forms.ServerForm(instance=server), "server": server}
         return TemplateResponse(request, "settings/edit_server.html", data)
 
-    def post(self, request):
+    def post(self, request, server=None):
         """ add a server from the admin panel """
-        form = forms.ServerForm(request.POST)
+        if server:
+            server = get_object_or_404(models.FederatedServer, id=server)
+
+        form = forms.ServerForm(request.POST, instance=server)
         if not form.is_valid():
-            data = {"form": form}
+            data = {"form": form, "server": server}
             return TemplateResponse(request, "settings/edit_server.html", data)
         server = form.save()
         return redirect("settings-federated-server", server.id)