diff --git a/src/at/oauth.gleam b/src/at/oauth.gleam
index 43e1762..374d8b0 100644
--- a/src/at/oauth.gleam
+++ b/src/at/oauth.gleam
@@ -342,11 +342,6 @@ pub fn public_client(
   redirect_uri: Uri,
   application_type: ApplicationType,
 ) -> Client {
-  let id = case id.host {
-    Some("localhost") -> Uri(..id, scheme: Some("http"), query: None)
-    _ -> id
-  }
-
   Client(
     id: id,
     name: None,
@@ -364,7 +359,6 @@ pub fn public_client(
 ///
 /// 
 pub fn localhost_client(redirect_port: Int, redirect_path: String) -> Client {
-  let id = Uri(..uri.empty, scheme: Some("http"), host: Some("localhost"))
   let redirect_uri =
     Uri(
       ..uri.empty,
@@ -373,6 +367,13 @@ pub fn localhost_client(redirect_port: Int, redirect_path: String) -> Client {
       port: Some(redirect_port),
       path: redirect_path,
     )
+  let id =
+    Uri(
+      ..uri.empty,
+      scheme: Some("http"),
+      host: Some("localhost"),
+      query: Some("redirect_uri=" <> uri.to_string(redirect_uri)),
+    )
 
   public_client(id, redirect_uri, Native)
 }