diff --git a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
index f1de13b9f0..685a7483ec 100644
--- a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
+++ b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
@@ -422,7 +422,13 @@ public class RestAnnotationProcessor<T> {
       
       tokenValues.putAll(addPathAndGetTokens(declaring, method, args, uriBuilder));
       
-      Multimap<String, Object> formParams = addFormParams(tokenValues, method, args);
+      Multimap<String, Object> formParams;
+      if (caller != null) {
+         formParams = addFormParams(tokenValues, caller.getMethod(), caller.getArgs());
+         formParams.putAll(addFormParams(tokenValues, method, args));
+      } else {
+         formParams = addFormParams(tokenValues, method, args);
+      }
       Multimap<String, Object> queryParams = addQueryParams(tokenValues, method, args);
       Multimap<String, String> headers = buildHeaders(tokenValues, method, args);
 
diff --git a/core/src/test/java/org/jclouds/rest/annotationparsing/DelegateAnnotationExpectTest.java b/core/src/test/java/org/jclouds/rest/annotationparsing/DelegateAnnotationExpectTest.java
index 888eeb23cd..aacdd03022 100644
--- a/core/src/test/java/org/jclouds/rest/annotationparsing/DelegateAnnotationExpectTest.java
+++ b/core/src/test/java/org/jclouds/rest/annotationparsing/DelegateAnnotationExpectTest.java
@@ -23,6 +23,7 @@ import static org.testng.Assert.assertTrue;
 
 import java.util.concurrent.TimeUnit;
 
+import javax.ws.rs.FormParam;
 import javax.ws.rs.HEAD;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -56,6 +57,8 @@ public class DelegateAnnotationExpectTest extends BaseRestClientExpectTest<Deleg
 
    @Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
    static interface DelegatingApi {
+      @Delegate
+      DiskApi getDiskApiForProjectForm(@FormParam("project") String projectName);
 
       @Delegate
       @Path("/projects/{project}")
@@ -63,6 +66,8 @@ public class DelegateAnnotationExpectTest extends BaseRestClientExpectTest<Deleg
    }
 
    static interface DelegatingAsyncApi {
+      @Delegate
+      DiskAsyncApi getDiskApiForProjectForm(@FormParam("project") String projectName);
 
       @Delegate
       @Path("/projects/{project}")
@@ -71,12 +76,17 @@ public class DelegateAnnotationExpectTest extends BaseRestClientExpectTest<Deleg
 
    @Timeout(duration = 1, timeUnit = TimeUnit.SECONDS)
    static interface DiskApi {
+      void form();
+
       void syncAll();
 
       boolean exists(@PathParam("disk") String diskName);
    }
 
    static interface DiskAsyncApi {
+      @POST
+      ListenableFuture<Void> form();
+
       @POST
       @Payload("<Sync>{project}</Sync>")
       ListenableFuture<Void> syncAll();
@@ -87,6 +97,14 @@ public class DelegateAnnotationExpectTest extends BaseRestClientExpectTest<Deleg
       public ListenableFuture<Boolean> exists(@PathParam("disk") String diskName);
    }
 
+   public void testDelegatingCallTakesIntoConsiderationAndCalleeFormParam() {
+
+      DelegatingApi client = requestSendsResponse(HttpRequest.builder().method("POST").endpoint("http://mock")
+            .addFormParam("project", "prod").build(), HttpResponse.builder().statusCode(200).build());
+
+      client.getDiskApiForProjectForm("prod").form();
+   }
+
    public void testDelegatingCallTakesIntoConsiderationAndCalleePayloadParam() {
 
       DelegatingApi client = requestSendsResponse(