diff --git a/auth/lib/models/code.dart b/auth/lib/models/code.dart
index 1486d5c7c3..852d1dd789 100644
--- a/auth/lib/models/code.dart
+++ b/auth/lib/models/code.dart
@@ -174,12 +174,13 @@ class Code {
   }
 
   String toOTPAuthUrlFormat() {
-    return jsonEncode(
-      Uri.parse(
-        "$rawData&codeDisplay="
-        "${jsonEncode(display.toJson())}",
-      ).toString(),
-    );
+    final uri = Uri.parse(rawData);
+    final query = {...uri.queryParameters};
+    query["codeDisplay"] = jsonEncode(display.toJson());
+
+    final newUri = uri.replace(queryParameters: query);
+
+    return jsonEncode(newUri.toString());
   }
 
   static String _getIssuer(Uri uri) {