diff --git a/http-service/src/main/java/net/runelite/http/service/account/AccountService.java b/http-service/src/main/java/net/runelite/http/service/account/AccountService.java
index b31280f599..5dd62feb2a 100644
--- a/http-service/src/main/java/net/runelite/http/service/account/AccountService.java
+++ b/http-service/src/main/java/net/runelite/http/service/account/AccountService.java
@@ -157,9 +157,9 @@ public class AccountService
 	public Object callback(
 		HttpServletRequest request,
 		HttpServletResponse response,
-		@RequestParam String error,
+		@RequestParam(required = false) String error,
 		@RequestParam String code,
-		@RequestParam State state
+		@RequestParam("state") String stateStr
 	) throws InterruptedException, ExecutionException, IOException
 	{
 		if (error != null)
@@ -168,6 +168,8 @@ public class AccountService
 			return null;
 		}
 
+		State state = gson.fromJson(stateStr, State.class);
+
 		logger.info("Got authorization code {} for uuid {}", code, state.getUuid());
 
 		OAuth20Service service = new ServiceBuilder()