diff --git a/server/brmbar-server b/server/brmbar-server
index aad45cf..77cbc26 100755
--- a/server/brmbar-server
+++ b/server/brmbar-server
@@ -96,19 +96,20 @@ def items():
     items = [dict(code = row[0], name = row[1], price = row[2]) for row in cur.fetchall()]
     return render_template('items.html', items = items)
 
-@app.route('/items/', methods=['POST'])
+@app.route('/items/', methods = ['POST'])
 def items_post():
     f = request.form
-    if f['action'] == 'add':
-        if f['code'] and f['name'] and f['price']:
-            g.db.execute('INSERT INTO items (code, name, price) VALUES (?, ?, ?)', (f['code'], f['name'], f['price']))
+    for (k, v) in f.iteritems():
+        if k == 'add' and v == 'add':
+            if f['code'] and f['name'] and f['price']:
+                g.db.execute('INSERT INTO items (code, name, price) VALUES (?, ?, ?)', (f['code'], f['name'], f['price']))
+                g.db.commit()
+            return redirect('/items/')
+        if k.startswith('delete:') and v == 'delete':
+            code = k[7:]
+            g.db.execute('DELETE FROM items WHERE code = ?', (code, ))
             g.db.commit()
-        return redirect('/items/')
-    if f['action'].startswith('delete:'):
-        code = int(f['action'][7:])
-        g.db.execute('DELETE FROM items WHERE code = ?', (code, ))
-        g.db.commit()
-        return redirect('/items/')
+            return redirect('/items/')
     abort(400)
 
 @app.route('/barcodes.txt')
diff --git a/server/templates/items.html b/server/templates/items.html
index 292d74c..cd93433 100644
--- a/server/templates/items.html
+++ b/server/templates/items.html
@@ -5,9 +5,9 @@
 <form action="" method="post">
 <table>
 <tr><th>image</th><th>code</th><th>item</th><th>price</th><th>action</th></tr>
-<tr><td></td><td><input name="code" size="14"/></td><td><input name="name" size="30"/></td><td><input name="price" size="2"/></td><td><input type="submit" name="action" value="add"/></tr>
+<tr><td></td><td><input name="code" size="14"/></td><td><input name="name" size="30"/></td><td><input name="price" size="2"/></td><td><input type="submit" name="add" value="add"/></tr>
 {% for item in items %}
-<tr><td><img src="/static/items/{{ item.code|safe }}.jpg" width="64" height="64"/></td><td>{{ item.code|safe }}</td><td>{{ item.name|safe }}</td><td>{{ item.price }}</td><td><input type="submit" name="action" value="delete:{{ item.code }}"/></tr>
+<tr><td><img src="/static/items/{{ item.code|safe }}.jpg" width="64" height="64"/></td><td>{{ item.code|safe }}</td><td>{{ item.name|safe }}</td><td>{{ item.price }}</td><td><input type="submit" name="delete:{{ item.code }}" value="delete"/></tr>
 {% endfor %}
 </table>
 </form>