diff --git a/bambu_buffer/__init__.py b/bambu_buffer/__init__.py
index 4992ce9..9160b89 100644
--- a/bambu_buffer/__init__.py
+++ b/bambu_buffer/__init__.py
@@ -31,7 +31,7 @@ class BufferThread(Thread):
 
 def post(item, author, **kwargs):
     try:
-        token = author.buffer_tokens.get()
+        token = author.buffer_token
     except BufferToken.DoesNotExist:
         return
 
diff --git a/bambu_buffer/migrations/0001_initial.py b/bambu_buffer/migrations/0001_initial.py
index e27d9a2..4067b34 100644
--- a/bambu_buffer/migrations/0001_initial.py
+++ b/bambu_buffer/migrations/0001_initial.py
@@ -57,7 +57,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('token', models.CharField(max_length=36)),
-                ('user', models.OneToOneField(related_name='buffer_tokens', to=settings.AUTH_USER_MODEL)),
+                ('user', models.OneToOneField(related_name='buffer_token', to=settings.AUTH_USER_MODEL)),
             ],
             options={
                 'db_table': 'buffer_token',
diff --git a/bambu_buffer/models.py b/bambu_buffer/models.py
index 535d3da..ff5f9ea 100644
--- a/bambu_buffer/models.py
+++ b/bambu_buffer/models.py
@@ -6,7 +6,7 @@ from bambu_buffer.receivers import *
 import requests, json
 
 class BufferToken(models.Model):
-    user = models.OneToOneField('auth.User', related_name = 'buffer_tokens')
+    user = models.OneToOneField('auth.User', related_name = 'buffer_token')
     token = models.CharField(max_length = 36)
 
     def __unicode__(self):
diff --git a/bambu_buffer/views.py b/bambu_buffer/views.py
index c02a584..d6135c0 100644
--- a/bambu_buffer/views.py
+++ b/bambu_buffer/views.py
@@ -59,8 +59,13 @@ def callback(request):
         token = data.get('access_token')
 
         with transaction.atomic():
-            request.user.buffer_tokens.all().delete()
-            request.user.buffer_tokens.create(
+            try:
+                request.user.buffer_token.delete()
+            except BufferToken.DoesNotExist:
+                pass
+
+            BufferToken.objects.create(
+                user = user,
                 token = token
             )
 
@@ -76,7 +81,7 @@ def callback(request):
 @login_required
 def profiles(request):
     try:
-        token = request.user.buffer_tokens.get()
+        token = request.user.buffer_token
     except BufferToken.DoesNotExist:
         return HttpResponseRedirect(
             reverse('buffer_auth')
@@ -120,7 +125,7 @@ def profiles(request):
 @login_required
 def refresh(request):
     try:
-        token = request.user.buffer_tokens.get()
+        token = request.user.buffer_token
     except BufferToken.DoesNotExist:
         return HttpResponseRedirect(
             reverse('buffer_auth')