diff --git a/api.go b/api.go
index 4e8e3330c..0999ebaa0 100644
--- a/api.go
+++ b/api.go
@@ -378,10 +378,9 @@ func postCommit(srv *Server, version float64, w http.ResponseWriter, r *http.Req
 		utils.Errorf("%s", err)
 	}
 
-	job := srv.Eng.Job("commit")
+	job := srv.Eng.Job("commit", r.Form.Get("container"))
 	job.Setenv("repo", r.Form.Get("repo"))
 	job.Setenv("tag", r.Form.Get("tag"))
-	job.Setenv("container", r.Form.Get("container"))
 	job.Setenv("author", r.Form.Get("author"))
 	job.Setenv("comment", r.Form.Get("comment"))
 	job.SetenvJson("config", config)
diff --git a/integration/server_test.go b/integration/server_test.go
index ab9e39c2e..90752e23e 100644
--- a/integration/server_test.go
+++ b/integration/server_test.go
@@ -155,8 +155,7 @@ func TestCommit(t *testing.T) {
 
 	id := createTestContainer(eng, config, t)
 
-	job := eng.Job("commit")
-	job.Setenv("container", id)
+	job := eng.Job("commit", id)
 	job.Setenv("repo", "testrepo")
 	job.Setenv("tag", "testtag")
 	job.SetenvJson("config", config)
@@ -268,8 +267,7 @@ func TestRmi(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	job = eng.Job("commit")
-	job.Setenv("container", containerID)
+	job = eng.Job("commit", containerID)
 	job.Setenv("repo", "test")
 	var imageID string
 	job.Stdout.AddString(&imageID)
@@ -296,8 +294,7 @@ func TestRmi(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	job = eng.Job("commit")
-	job.Setenv("container", containerID)
+	job = eng.Job("commit", containerID)
 	job.Setenv("repo", "test")
 	if err := job.Run(); err != nil {
 		t.Fatal(err)
diff --git a/server.go b/server.go
index 4ae34c429..e7bb73d4e 100644
--- a/server.go
+++ b/server.go
@@ -774,11 +774,11 @@ func createAPIContainer(names []string, container *Container, size bool, runtime
 	return c
 }
 func (srv *Server) ContainerCommit(job *engine.Job) engine.Status {
-	if len(job.Args) != 0 {
-		job.Errorf("Usage: %s\n", job.Name)
+	if len(job.Args) != 1 {
+		job.Errorf("Not enough arguments. Usage: %s CONTAINER\n", job.Name)
 		return engine.StatusErr
 	}
-	name := job.Getenv("container")
+	name := job.Args[0]
 
 	container := srv.runtime.Get(name)
 	if container == nil {