diff --git a/inventory-app/doorboy.py b/inventory-app/doorboy.py
index 4a35ec0..8ac6a54 100644
--- a/inventory-app/doorboy.py
+++ b/inventory-app/doorboy.py
@@ -85,6 +85,7 @@ def view_doorboy_enable(token_id):
 
 class TokenEditForm(FlaskForm):
     comment = StringField("Comment")
+    enabled = BooleanField("Enabled")
 
 @page_doorboy.route("/m/doorboy/<token_id>/edit", methods=["GET"])
 @login_required
@@ -98,6 +99,9 @@ def view_doorboy_edit(token_id):
     })
     form = TokenEditForm()
     form.comment.data = token["token"].get("comment", "")
+    if token["token"].get("enabled"):
+        form.enabled.render_kw = {"checked": "checked"}
+        form.enabled.data = "y"
     return render_template("doorboy_token_edit.html", form=form, token=token)
 
 @page_doorboy.route("/m/doorboy/<token_id>/edit", methods=["POST"])
@@ -114,9 +118,10 @@ def save_doorboy_edit(token_id):
         }, {
             "$set": {
                 "token.comment": form.comment.data,
+                "token.enabled": form.enabled.data,
             }
         })
-    return redirect("/m/doorboy")
+    return redirect("/m/doorboy/me")
 
 class HoldDoorForm(FlaskForm):
     door_name = SelectField("Door name", choices=[(j,j) for j in ["grounddoor", "frontdoor", "backdoor"]], validators=[DataRequired()])
diff --git a/inventory-app/templates/doorboy_token_edit.html b/inventory-app/templates/doorboy_token_edit.html
index 950ea9b..3a90bfa 100644
--- a/inventory-app/templates/doorboy_token_edit.html
+++ b/inventory-app/templates/doorboy_token_edit.html
@@ -6,6 +6,13 @@
     <form method="POST" autocomplete="off">
         {{ form.csrf_token }}
         {{ form.comment.label }} {{ form.comment(size=20) }}
+        <p>
+          <label>
+            {{ form.enabled }}
+            <span>{{ form.enabled.label }}</span>
+          </label>
+        </p>
+        <br/>
         <button class="btn waves-effect waves-light" type="submit">Save</button>
     </form>
 </div>