diff --git a/framework/core/src/Api/Actions/JsonApiAction.php b/framework/core/src/Api/Actions/JsonApiAction.php
index d8d4a140b..734fb573a 100644
--- a/framework/core/src/Api/Actions/JsonApiAction.php
+++ b/framework/core/src/Api/Actions/JsonApiAction.php
@@ -35,7 +35,7 @@ abstract class JsonApiAction implements ActionInterface
         }
     }
 
-    protected function json($data, $status = 200)
+    protected function json($data = null, $status = 200)
     {
         if ($data === null) $data = new \ArrayObject();
 
diff --git a/framework/core/src/Api/Actions/Users/ForgotAction.php b/framework/core/src/Api/Actions/Users/ForgotAction.php
index 41b0cd742..d2427a338 100644
--- a/framework/core/src/Api/Actions/Users/ForgotAction.php
+++ b/framework/core/src/Api/Actions/Users/ForgotAction.php
@@ -4,7 +4,6 @@ use Flarum\Api\Request;
 use Flarum\Api\Actions\JsonApiAction;
 use Flarum\Core\Repositories\UserRepositoryInterface;
 use Flarum\Core\Commands\RequestPasswordResetCommand;
-use Illuminate\Http\Response;
 use Illuminate\Contracts\Bus\Dispatcher;
 
 class ForgotAction extends JsonApiAction
@@ -23,7 +22,7 @@ class ForgotAction extends JsonApiAction
      * Log in and return a token.
      *
      * @param \Flarum\Api\Request $request
-     * @return \Flarum\Api\Response
+     * @return \Psr\Http\Message\ResponseInterface
      */
     public function respond(Request $request)
     {
@@ -33,6 +32,6 @@ class ForgotAction extends JsonApiAction
             new RequestPasswordResetCommand($email)
         );
 
-        return new Response;
+        return $this->json();
     }
 }