diff --git a/server/src/com/cloud/api/ApiServlet.java b/server/src/com/cloud/api/ApiServlet.java
index ca6f4b46806..98c460af7c8 100755
--- a/server/src/com/cloud/api/ApiServlet.java
+++ b/server/src/com/cloud/api/ApiServlet.java
@@ -79,7 +79,7 @@ public class ApiServlet extends HttpServlet {
         String[] paramsInQueryString = req.getQueryString().split("&");
         if (paramsInQueryString != null) {
             for (String param : paramsInQueryString) {
-                String[] paramTokens = param.split("=");
+                String[] paramTokens = param.split("=", 2);
                 if (paramTokens != null && paramTokens.length == 2) {
                     String name = paramTokens[0];
                     String value = paramTokens[1];