diff --git a/actions/finishopenidlogin.php b/actions/finishopenidlogin.php
index 3d0c8f2779..2b3616ffae 100644
--- a/actions/finishopenidlogin.php
+++ b/actions/finishopenidlogin.php
@@ -264,8 +264,9 @@ class FinishopenidloginAction extends Action {
 			$profile->delete();
 		}
 
+		$result = oid_link_user($user->id, $canonical, $display);
 		
-		if (!oid_link_user($user->id, $canonical, $display) {
+		if (!$result) {
 			# Try to clean up...
 			$user->delete();
 			$profile->delete();