diff --git a/src/pretix/locale/de/LC_MESSAGES/django.po b/src/pretix/locale/de/LC_MESSAGES/django.po
index 2d8026ecc0..e3c4690c9e 100644
--- a/src/pretix/locale/de/LC_MESSAGES/django.po
+++ b/src/pretix/locale/de/LC_MESSAGES/django.po
@@ -4,8 +4,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-05 08:57+0000\n"
-"PO-Revision-Date: 2017-09-05 11:14+0200\n"
+"POT-Creation-Date: 2017-09-05 09:55+0000\n"
+"PO-Revision-Date: 2017-09-05 12:10+0200\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: Raphael Michel <michel@rami.io>\n"
 "Language: de\n"
@@ -1047,7 +1047,7 @@ msgstr "Antwort"
 #: pretix/plugins/checkinlists/exporters.py:69
 #: pretix/plugins/checkinlists/exporters.py:109
 #: pretix/plugins/pretixdroid/models.py:14
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:46
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:52
 #: pretix/plugins/reports/exporters.py:249
 msgctxt "subevent"
 msgid "Date"
@@ -1234,8 +1234,8 @@ msgstr "Das Produkt \"{item}\" ist nicht mehr verfügbar."
 #: pretix/base/models/orders.py:494 pretix/control/views/item.py:436
 #: pretix/control/views/vouchers.py:81 pretix/control/views/vouchers.py:82
 #: pretix/plugins/checkinlists/exporters.py:124
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:71
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:72
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:77
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:78
 #: pretix/presale/checkoutflow.py:477
 msgid "Yes"
 msgstr "Ja"
@@ -1245,8 +1245,8 @@ msgstr "Ja"
 #: pretix/control/views/vouchers.py:82
 #: pretix/plugins/checkinlists/exporters.py:124
 #: pretix/plugins/paypal/templates/pretixplugins/paypal/action_refund.html:14
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:71
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:72
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:77
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:78
 #: pretix/plugins/stripe/templates/pretixplugins/stripe/action_refund.html:14
 #: pretix/presale/checkoutflow.py:479
 msgid "No"
@@ -3789,8 +3789,8 @@ msgstr "Alle Veranstalter"
 
 #: pretix/control/forms/filter.py:195
 #: pretix/control/templates/pretixcontrol/organizers/teams.html:39
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:59
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:63
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:65
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:69
 msgid "All"
 msgstr "Alle"
 
@@ -6100,7 +6100,7 @@ msgid "The following products might be no longer available for sale:"
 msgstr "Die folgenden Produkte stehen möglicherweise nicht mehr zum Verkauf:"
 
 #: pretix/control/templates/pretixcontrol/items/quota_edit.html:27
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:48
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:54
 msgid "Items"
 msgstr "Produkte"
 
@@ -8923,11 +8923,11 @@ msgstr ""
 "pretixdroid ist eine Android-App, mit der Sie am Eingang Ihrer Veranstaltung "
 "die Tickets scannen und überprüfen können."
 
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:11
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:13
 msgid "Create app configuration"
 msgstr "App-Konfiguration erstellen"
 
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:13
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:15
 msgid ""
 "To start scanning tickets with our Android app, first create a configuration "
 "code here:"
@@ -8935,27 +8935,31 @@ msgstr ""
 "Um mit unserer Android-App Tickets zu scannen, erstellen Sie hier erst einen "
 "Konfigurations-Code:"
 
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:30
-msgid "Create"
-msgstr "Erstellen"
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:32
+msgid "Create configuration"
+msgstr "App-Konfiguration erstellen"
 
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:38
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:41
 msgid "Existing app configurations"
 msgstr "Bestehende App-Konfigurationen"
 
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:44
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:43
+msgid "Create a new configuration"
+msgstr "Neue App-Konfiguration erstellen"
+
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:50
 msgid "ID"
 msgstr "ID"
 
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:49
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:55
 msgid "Show info"
 msgstr "Infos anzeigen"
 
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:50
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:56
 msgid "Allow search"
 msgstr "Sucher erlauben"
 
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:75
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:81
 msgid "Show QR code"
 msgstr "QR-Code anzeigen"
 
@@ -10824,6 +10828,9 @@ msgstr "Deutsch"
 msgid "German (informal)"
 msgstr "Deutsch (Du)"
 
+#~ msgid "Create"
+#~ msgstr "Erstellen"
+
 #~ msgid "Payment method fee tax rate"
 #~ msgstr "Steuersatz auf Gebühr für gewählte Zahlungsmethode"
 
diff --git a/src/pretix/locale/de/LC_MESSAGES/djangojs.po b/src/pretix/locale/de/LC_MESSAGES/djangojs.po
index 2b6d0bce56..6e5727a06c 100644
--- a/src/pretix/locale/de/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/de/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-05 08:57+0000\n"
+"POT-Creation-Date: 2017-09-05 09:55+0000\n"
 "PO-Revision-Date: 2017-08-27 09:35+0200\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: \n"
diff --git a/src/pretix/locale/de_Informal/LC_MESSAGES/django.po b/src/pretix/locale/de_Informal/LC_MESSAGES/django.po
index 737816e567..d14c9ab8df 100644
--- a/src/pretix/locale/de_Informal/LC_MESSAGES/django.po
+++ b/src/pretix/locale/de_Informal/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-05 08:57+0000\n"
-"PO-Revision-Date: 2017-09-05 11:15+0200\n"
+"POT-Creation-Date: 2017-09-05 09:55+0000\n"
+"PO-Revision-Date: 2017-09-05 12:10+0200\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: Raphael Michel <michel@rami.io>\n"
 "Language: de\n"
@@ -1049,7 +1049,7 @@ msgstr "Antwort"
 #: pretix/plugins/checkinlists/exporters.py:69
 #: pretix/plugins/checkinlists/exporters.py:109
 #: pretix/plugins/pretixdroid/models.py:14
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:46
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:52
 #: pretix/plugins/reports/exporters.py:249
 msgctxt "subevent"
 msgid "Date"
@@ -1236,8 +1236,8 @@ msgstr "Das Produkt \"{item}\" ist nicht mehr verfügbar."
 #: pretix/base/models/orders.py:494 pretix/control/views/item.py:436
 #: pretix/control/views/vouchers.py:81 pretix/control/views/vouchers.py:82
 #: pretix/plugins/checkinlists/exporters.py:124
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:71
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:72
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:77
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:78
 #: pretix/presale/checkoutflow.py:477
 msgid "Yes"
 msgstr "Ja"
@@ -1247,8 +1247,8 @@ msgstr "Ja"
 #: pretix/control/views/vouchers.py:82
 #: pretix/plugins/checkinlists/exporters.py:124
 #: pretix/plugins/paypal/templates/pretixplugins/paypal/action_refund.html:14
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:71
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:72
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:77
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:78
 #: pretix/plugins/stripe/templates/pretixplugins/stripe/action_refund.html:14
 #: pretix/presale/checkoutflow.py:479
 msgid "No"
@@ -3786,8 +3786,8 @@ msgstr "Alle Veranstalter"
 
 #: pretix/control/forms/filter.py:195
 #: pretix/control/templates/pretixcontrol/organizers/teams.html:39
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:59
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:63
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:65
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:69
 msgid "All"
 msgstr "Alle"
 
@@ -6088,7 +6088,7 @@ msgid "The following products might be no longer available for sale:"
 msgstr "Die folgenden Produkte stehen möglicherweise nicht mehr zum Verkauf:"
 
 #: pretix/control/templates/pretixcontrol/items/quota_edit.html:27
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:48
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:54
 msgid "Items"
 msgstr "Produkte"
 
@@ -8902,11 +8902,11 @@ msgstr ""
 "pretixdroid ist eine Android-App, mit der du am Eingang deiner Veranstaltung "
 "die Tickets scannen und überprüfen kannst."
 
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:11
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:13
 msgid "Create app configuration"
 msgstr "App-Konfiguration erstellen"
 
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:13
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:15
 msgid ""
 "To start scanning tickets with our Android app, first create a configuration "
 "code here:"
@@ -8914,27 +8914,31 @@ msgstr ""
 "Um mit unserer Android-App Tickets zu scannen, erstelle hier erst einen "
 "Konfigurations-Code:"
 
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:30
-msgid "Create"
-msgstr "Erstellen"
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:32
+msgid "Create configuration"
+msgstr "App-Konfiguration erstellen"
 
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:38
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:41
 msgid "Existing app configurations"
 msgstr "Bestehende App-Konfigurationen"
 
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:44
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:43
+msgid "Create a new configuration"
+msgstr "Neue App-Konfiguration erstellen"
+
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:50
 msgid "ID"
 msgstr "ID"
 
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:49
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:55
 msgid "Show info"
 msgstr "Infos anzeigen"
 
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:50
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:56
 msgid "Allow search"
 msgstr "Suche erlauben"
 
-#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:75
+#: pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html:81
 msgid "Show QR code"
 msgstr "QR-Code anzeigen"
 
@@ -10795,6 +10799,9 @@ msgstr "Deutsch"
 msgid "German (informal)"
 msgstr "Deutsch (Du)"
 
+#~ msgid "Create"
+#~ msgstr "Erstellen"
+
 #~ msgid "Payment method fee tax rate"
 #~ msgstr "Steuersatz auf Gebühr für gewählte Zahlungsmethode"
 
diff --git a/src/pretix/locale/de_Informal/LC_MESSAGES/djangojs.po b/src/pretix/locale/de_Informal/LC_MESSAGES/djangojs.po
index 5237d25f3d..eeab91b78c 100644
--- a/src/pretix/locale/de_Informal/LC_MESSAGES/djangojs.po
+++ b/src/pretix/locale/de_Informal/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-05 08:57+0000\n"
+"POT-Creation-Date: 2017-09-05 09:55+0000\n"
 "PO-Revision-Date: 2017-08-27 09:35+0200\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: \n"
diff --git a/src/pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html b/src/pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html
index 76a9082215..7581030c2b 100644
--- a/src/pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html
+++ b/src/pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html
@@ -8,35 +8,41 @@
     <p>{% blocktrans trimmed %}
         pretixdroid is an Android app that you can use to control tickets at the entrance of your event.
     {% endblocktrans %}</p>
-    <h2>{% trans "Create app configuration" %}</h2>
-    <p>
-        {% blocktrans trimmed %}
-            To start scanning tickets with our Android app, first create a configuration code here:
-        {% endblocktrans %}
-    </p>
-    <form action="" method="post" class="form-horizontal">
-        {% csrf_token %}
-        {% bootstrap_form_errors add_form %}
-        {% bootstrap_field add_form.all_items layout="horizontal" %}
-        {% bootstrap_field add_form.items layout="horizontal" %}
-        {% bootstrap_field add_form.show_info layout="horizontal" %}
-        {% bootstrap_field add_form.allow_search layout="horizontal" %}
-        {% if add_form.subevent %}
-            {% bootstrap_field add_form.subevent layout="horizontal" %}
-        {% endif %}
-        <div class="form-group">
-            <div class="col-md-offset-3 col-md-9">
-                <button type="submit" class="btn btn-primary btn-save" name="add" value="1">
-                    {% trans "Create" %}
-                </button>
+
+    {% if not configs or "create" in request.GET %}
+        <h2>{% trans "Create app configuration" %}</h2>
+        <p>
+            {% blocktrans trimmed %}
+                To start scanning tickets with our Android app, first create a configuration code here:
+            {% endblocktrans %}
+        </p>
+        <form action="?add" method="post" class="form-horizontal">
+            {% csrf_token %}
+            {% bootstrap_form_errors add_form %}
+            {% bootstrap_field add_form.all_items layout="horizontal" %}
+            {% bootstrap_field add_form.items layout="horizontal" %}
+            {% bootstrap_field add_form.show_info layout="horizontal" %}
+            {% bootstrap_field add_form.allow_search layout="horizontal" %}
+            {% if add_form.subevent %}
+                {% bootstrap_field add_form.subevent layout="horizontal" %}
+            {% endif %}
+            <div class="form-group">
+                <div class="col-md-offset-3 col-md-9">
+                    <button type="submit" class="btn btn-primary btn-save" name="add" value="1">
+                        {% trans "Create configuration" %}
+                    </button>
+                </div>
             </div>
-        </div>
-    </form>
+        </form>
+    {% endif %}
 
 
-    {% if configs %}
+    {% if configs and "create" not in request.GET %}
         <h2>{% trans "Existing app configurations" %}</h2>
-        <form action="" method="post" class="form-horizontal">
+        <a href="?create=1" class="btn btn-default">
+            {% trans "Create a new configuration" %}
+        </a>
+        <form action="?" method="post" class="form-horizontal">
             {% csrf_token %}
             <table class="table">
                 <thead>