diff --git a/src/tokens/migrations/0003_token_category.py b/src/tokens/migrations/0003_token_category.py
new file mode 100644
index 00000000..c9a75997
--- /dev/null
+++ b/src/tokens/migrations/0003_token_category.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.0.4 on 2018-08-19 15:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tokens', '0002_tokenfind'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='token',
+            name='category',
+            field=models.TextField(default='', help_text='The category/hint for this token (physical, website, whatever)'),
+            preserve_default=False,
+        ),
+    ]
diff --git a/src/tokens/migrations/0004_auto_20180819_1743.py b/src/tokens/migrations/0004_auto_20180819_1743.py
new file mode 100644
index 00000000..35b380a7
--- /dev/null
+++ b/src/tokens/migrations/0004_auto_20180819_1743.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.0.4 on 2018-08-19 15:43
+
+from django.conf import settings
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('tokens', '0003_token_category'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='tokenfind',
+            unique_together={('user', 'token')},
+        ),
+    ]
diff --git a/src/tokens/models.py b/src/tokens/models.py
index c496be63..f54cc59b 100644
--- a/src/tokens/models.py
+++ b/src/tokens/models.py
@@ -13,6 +13,10 @@ class Token(CampRelatedModel):
         help_text="The secret token"
     )
 
+    category = models.TextField(
+        help_text="The category/hint for this token (physical, website, whatever)"
+    )
+
     description = models.TextField(
         help_text="The description of the token"
     )
@@ -24,6 +28,9 @@ class Token(CampRelatedModel):
 
 
 class TokenFind(CampRelatedModel):
+    class Meta:
+        unique_together = (('user', 'token'))
+
     token = models.ForeignKey(
         'tokens.Token',
         on_delete=models.PROTECT