diff --git a/_includes/oauth-out-of-bounds.html b/_includes/oauth-out-of-bounds.html
index 4e0cf19f9..fec0aa917 100644
--- a/_includes/oauth-out-of-bounds.html
+++ b/_includes/oauth-out-of-bounds.html
@@ -1,8 +1,31 @@
 <script language="JavaScript">
-var searchQuery = window.location.search;
+
+var searchQuery = window.location.search.substring(1);
+var vars = searchQuery.split('&');
+
+function getQueryVariable(variable) {
+    for (var i = 0; i < vars.length; i++) {
+        var pair = vars[i].split('=');
+        if (decodeURIComponent(pair[0]) == variable) {
+            return decodeURIComponent(pair[1]);
+        }
+    }
+	return null;
+}
 
 if (searchQuery && searchQuery.length >= 1) {
 	var oldTitle = (window.document.title === undefined) ? "" : window.document.title;
-	window.document.title=oldTitle + "||" + searchQuery.substring(1) + "||";
+	var state=getQueryVariable("state");
+	var code=getQueryVariable("code");
+	var error=getQueryVariable("error") || "unknown";
+	
+	if (error == null && (state || code)) {
+		window.document.title=oldTitle + "?state=" + state + "&code=" + code;
+	} else {
+		window.document.title=oldTitle + "?error=" + error;
+	}
+}
+else {
+	window.document.title=oldTitle + "?error=noquery";
 }
 </script>
diff --git a/pages/oauth/imgur.html b/pages/oauth/imgur.html
index 8b41dfd4e..e7a02d57d 100644
--- a/pages/oauth/imgur.html
+++ b/pages/oauth/imgur.html
@@ -1,6 +1,6 @@
 ---
 layout: oauth
-title: Greenshot authenticated with Imgur
+title: Imgur
 permalink: /oauth/imgur
 categories: [oauth]
 tags: [uses_alerts]