diff --git a/UPGRADING.md b/UPGRADING.md
new file mode 100644
index 000000000..087ac8a57
--- /dev/null
+++ b/UPGRADING.md
@@ -0,0 +1,18 @@
+# Upgrading from Django 1.5 to 3.0
+
+## Django 1.7
+
+pip install -r requirements.txt
+pip uninstall south
+./manage.py migrate
+
+## Django 1.8
+
+pip install -r requirements.txt
+./manage.py migrate
+
+## Django 1.9
+
+pip install -r requirements.txt
+./manage.py migrate oauth2_provider 0001 --fake
+./manage.py migrate
diff --git a/apps/oauth/views.py b/apps/oauth/views.py
index a5741a795..9b1ead59b 100644
--- a/apps/oauth/views.py
+++ b/apps/oauth/views.py
@@ -30,9 +30,9 @@ def twitter_connect(request):
     twitter_consumer_key = settings.TWITTER_CONSUMER_KEY
     twitter_consumer_secret = settings.TWITTER_CONSUMER_SECRET
     
-    oauth_token = request.POST.get('oauth_token')
-    oauth_verifier = request.POST.get('oauth_verifier')
-    denied = request.POST.get('denied')
+    oauth_token = request.GET.get('oauth_token')
+    oauth_verifier = request.GET.get('oauth_verifier')
+    denied = request.GET.get('denied')
     if denied:
         logging.user(request, "~BB~FRDenied Twitter connect")
         return {'error': 'Denied! Try connecting again.'}
@@ -93,7 +93,7 @@ def facebook_connect(request):
         "display": "popup",
     }
 
-    verification_code = request.POST.get('code')
+    verification_code = request.GET.get('code')
     if verification_code:
         args["client_secret"] = facebook_secret
         args["code"] = verification_code
@@ -135,9 +135,9 @@ def facebook_connect(request):
         
         logging.user(request, "~BB~FRFinishing Facebook connect")
         return {}
-    elif request.POST.get('error'):
-        logging.user(request, "~BB~FRFailed Facebook connect, error: %s" % request.POST.get('error'))
-        return {'error': '%s... Try connecting again.' % request.POST.get('error')}
+    elif request.GET.get('error'):
+        logging.user(request, "~BB~FRFailed Facebook connect, error: %s" % request.GET.get('error'))
+        return {'error': '%s... Try connecting again.' % request.GET.get('error')}
     else:
         # Start the OAuth process
         logging.user(request, "~BB~FRStarting Facebook connect")