diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex
index 841df8c32..e8483dec0 100644
--- a/lib/pleroma/web/oauth/oauth_controller.ex
+++ b/lib/pleroma/web/oauth/oauth_controller.ex
@@ -25,7 +25,8 @@ def create_authorization(conn, %{"authorization" => %{"name" => name, "password"
           auth: auth
         }
       else
-        url = "#{redirect_uri}?code=#{auth.token}"
+        connector = if String.contains?(redirect_uri, "?"), do: "&", else: "?"
+        url = "#{redirect_uri}#{connector}code=#{auth.token}"
         url = if params["state"] do
           url <> "&state=#{params["state"]}"
         else