diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index e7a9abb180..3dea07f16d 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -358,4 +358,8 @@ class RemotesubscribeAction extends Action {
 		common_redirect($req->to_url());
 		return;
 	}
+	
+	function make_nonce() {
+		return common_good_rand(16);
+	}
 }
\ No newline at end of file
diff --git a/lib/oauthstore.php b/lib/oauthstore.php
index fe7f68c02c..4ad1234551 100644
--- a/lib/oauthstore.php
+++ b/lib/oauthstore.php
@@ -26,7 +26,7 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
 	# We keep a record of who's contacted us
 	
 	function lookup_consumer($consumer_key) {
-		$con = new Consumer('key', $consumer_key);
+		$con = Consumer::staticGet('consumer_key', $consumer_key);
 		if (!$con) {
 			$con = new Consumer();
 			$con->consumer_key = $consumer_key;