diff --git a/AKSubmission/locale/de_DE/LC_MESSAGES/django.po b/AKSubmission/locale/de_DE/LC_MESSAGES/django.po
index a01a073333f1c19de41908bfff71f5d220292ff1..e6500ad74806be3cc03beb2160a564222c12a950 100644
--- a/AKSubmission/locale/de_DE/LC_MESSAGES/django.po
+++ b/AKSubmission/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-23 23:56+0000\n"
+"POT-Creation-Date: 2019-10-24 14:18+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,7 +26,7 @@ msgstr ""
 #: templates/AKSubmission/submission_overview.html:6
 #: templates/AKSubmission/submission_overview.html:11
 #: templates/AKSubmission/submission_overview.html:15
-#: templates/AKSubmission/submit_new.html:13
+#: templates/AKSubmission/submit_new.html:19
 #: templates/AKSubmission/submit_new_wish.html:10
 msgid "AK Submission"
 msgstr "AK-Eintragung"
@@ -98,17 +98,17 @@ msgid "AK Owner"
 msgstr "AK-Leitung"
 
 #: templates/AKSubmission/akowner_create_update.html:25
-#: templates/AKSubmission/submit_new.html:27
+#: templates/AKSubmission/submit_new.html:34
 msgid "Reset"
 msgstr "Zurücksetzen"
 
 #: templates/AKSubmission/akowner_create_update.html:29
-#: templates/AKSubmission/submit_new.html:31
+#: templates/AKSubmission/submit_new.html:38
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #: templates/AKSubmission/akowner_create_update.html:32
-#: templates/AKSubmission/submit_new.html:34
+#: templates/AKSubmission/submit_new.html:41
 msgid "Submit"
 msgstr "Eintragen"
 
@@ -135,9 +135,9 @@ msgid "I do not own AKs yet"
 msgstr "Ich leite bisher keine AKs"
 
 #: templates/AKSubmission/submission_overview.html:40
-#: templates/AKSubmission/submit_new.html:7
-#: templates/AKSubmission/submit_new.html:15
+#: templates/AKSubmission/submit_new.html:8
 #: templates/AKSubmission/submit_new.html:21
+#: templates/AKSubmission/submit_new.html:28
 msgid "New AK"
 msgstr "Neuer AK"
 
@@ -163,10 +163,14 @@ msgstr ""
 msgid "AK successfully created"
 msgstr "AK erfolgreich angelegt"
 
-#: views.py:183
+#: views.py:149
+msgid "AK successfully updated"
+msgstr "AK erfolgreich bearbeitet"
+
+#: views.py:193
 msgid "Person Info successfully updated"
 msgstr "Personen-Info erfolgreich bearbeitet"
 
-#: views.py:195
+#: views.py:205
 msgid "No user selected"
 msgstr "Keine Person ausgewählt"
diff --git a/AKSubmission/templates/AKSubmission/ak_detail.html b/AKSubmission/templates/AKSubmission/ak_detail.html
index 7c2ba070e28a0e3dbd46a82cec196ca78b9eb2f0..dcb1d07eea1ade9ae9d90cc5a1741bd8aedcd8c3 100644
--- a/AKSubmission/templates/AKSubmission/ak_detail.html
+++ b/AKSubmission/templates/AKSubmission/ak_detail.html
@@ -23,7 +23,7 @@
         {% if ak.link != "" %}
             <a href="{{ ak.link }}" class="btn btn-info">{%  fontawesome_icon 'external-link-alt' %}</a>
         {% endif %}
-        <a href="#" class="btn btn-success">{%  fontawesome_icon 'pencil-alt' %}</a>
+        <a href="{% url 'submit:ak_edit' event_slug=ak.event.slug pk=ak.pk %}" class="btn btn-success">{%  fontawesome_icon 'pencil-alt' %}</a>
     </div>
 
     <h2>{% if ak.wish %}{% trans "AK Wish" %}: {% endif %}{{ ak.name }}</h2>
diff --git a/AKSubmission/templates/AKSubmission/ak_list_table.html b/AKSubmission/templates/AKSubmission/ak_list_table.html
index 4f5d25cfc568d500526dd497eb02b15ebdd60004..f9d405e844e51d7f6ea89e3996c797704b67db63 100644
--- a/AKSubmission/templates/AKSubmission/ak_list_table.html
+++ b/AKSubmission/templates/AKSubmission/ak_list_table.html
@@ -39,7 +39,7 @@
                 {% if ak.link %}
                     <a href="{{ ak.link }}" class="btn btn-info">{%  fontawesome_icon 'external-link-alt' %}</a>
                 {% endif %}
-                <a href="#" class="btn btn-success">{%  fontawesome_icon 'pencil-alt' %}</a>
+                <a href="{% url 'submit:ak_edit' event_slug=event.slug pk=ak.pk %}" class="btn btn-success">{%  fontawesome_icon 'pencil-alt' %}</a>
             </td>
         </tr>
         <tr>
diff --git a/AKSubmission/urls.py b/AKSubmission/urls.py
index e743db7a3e9fded448167dbff9aa7477eb20da2e..637ce8358cc3cdd2c120babfcdaa8c5e1df2e4ef 100644
--- a/AKSubmission/urls.py
+++ b/AKSubmission/urls.py
@@ -10,6 +10,7 @@ urlpatterns = [
         include([
             path('', views.SubmissionOverviewView.as_view(), name='submission_overview'),
             path('ak/<int:pk>', views.AKDetailView.as_view(), name='ak_detail'),
+            path('ak/<int:pk>/edit/', views.AKEditView.as_view(), name='ak_edit'),
             path('aks/', views.AKListView.as_view(), name='ak_list'),
             path('aks/category/<int:category_pk>', views.AKListByCategoryView.as_view(), name='ak_list_by_category'),
             path('aks/tag/<int:tag_pk>', views.AKListByTagView.as_view(), name='ak_list_by_tag'),
diff --git a/AKSubmission/views.py b/AKSubmission/views.py
index c1cc51ffc49249b5a14323112c6c6aba7ac0ee93..873cc975a7ce78a4a4e676d7da84e4e88667e4eb 100644
--- a/AKSubmission/views.py
+++ b/AKSubmission/views.py
@@ -140,6 +140,16 @@ class AKWishSubmissionView(AKAndAKWishSubmissionView):
     form_class = AKWishForm
 
 
+class AKEditView(EventSlugMixin, UpdateView):
+    model = AK
+    template_name = 'AKSubmission/submit_new.html'
+    form_class = AKForm
+
+    def get_success_url(self):
+        messages.add_message(self.request, messages.SUCCESS, _("AK successfully updated"))
+        return reverse_lazy('submit:ak_detail', kwargs={'event_slug': self.kwargs['event_slug'], 'pk': self.object.pk})
+
+
 class AKOwnerCreateView(EventSlugMixin, CreateView):
     model = AKOwner
     template_name = 'AKSubmission/akowner_create_update.html'