diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c06034d4d11..9674912dfb2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,9 +21,11 @@ IMPROVEMENTS:
  * client: When `network_interface` is unspecified use interface attached to
    default route [GH-3546]
  * driver/docker: Detect OOM kill event [GH-3459]
+ * driver/docker: Add support for passing through user [GH-3612]
  * driver/docker: Adds support for adding host device to container via
    `--device` [GH-2938]
  * driver/docker: Adds support for `ulimit` and `sysctl` options [GH-3568]
+ * driver/rkt: Add support for passing through user [GH-3612]
  * driver/qemu: Support graceful shutdowns on unix platforms [GH-3411]
  * template: Updated to consul template 0.19.4 [GH-3543]
  * core/enterprise: Return 501 status code in Nomad Pro for Premium end points
diff --git a/client/driver/docker.go b/client/driver/docker.go
index 1d266f25a193..7be6447344a7 100644
--- a/client/driver/docker.go
+++ b/client/driver/docker.go
@@ -201,7 +201,7 @@ type DockerDriverConfig struct {
 	MacAddress       string              `mapstructure:"mac_address"`        // Pin mac address to container
 	SecurityOpt      []string            `mapstructure:"security_opt"`       // Flags to pass directly to security-opt
 	Devices          []DockerDevice      `mapstructure:"devices"`            // To allow mounting USB or other serial control devices
-	User             string              `json:"User,omitempty" yaml:"User,omitempty" toml:"User,omitempty"`
+	User             string              `mapstructure:user`
 }
 
 func sliceMergeUlimit(ulimitsRaw map[string]string) ([]docker.ULimit, error) {