diff --git a/plugins/WebFinger/WebFingerPlugin.php b/plugins/WebFinger/WebFingerPlugin.php
index 24200a6f36..7e3453ffb2 100644
--- a/plugins/WebFinger/WebFingerPlugin.php
+++ b/plugins/WebFinger/WebFingerPlugin.php
@@ -58,6 +58,18 @@ class WebFingerPlugin extends Plugin
         return true;
     }
 
+    public function onStartGetProfileAcctUri(Profile $profile, &$acct)
+    {
+        $wfr = new WebFingerResource_Profile($profile);
+        try {
+            $acct = $wfr->reconstructAcct();
+        } catch (Exception $e) {
+            return true;
+        }
+
+        return false;
+    }
+
     public function onEndGetWebFingerResource($resource, WebFingerResource &$target=null, array $args=array())
     {
         $profile = null;
diff --git a/plugins/WebFinger/lib/webfingerresource/profile.php b/plugins/WebFinger/lib/webfingerresource/profile.php
index 03dd84e0ef..76987cb3ef 100644
--- a/plugins/WebFinger/lib/webfingerresource/profile.php
+++ b/plugins/WebFinger/lib/webfingerresource/profile.php
@@ -31,7 +31,7 @@ class WebFingerResource_Profile extends WebFingerResource
         return array_merge($aliases, parent::getAliases());
     }
 
-    protected function reconstructAcct()
+    public function reconstructAcct()
     {
         $acct = null;