diff --git a/authority/provisioner/options.go b/authority/provisioner/options.go
index 72263466..ddd011b4 100644
--- a/authority/provisioner/options.go
+++ b/authority/provisioner/options.go
@@ -36,7 +36,7 @@ func TemplateOptions(o *ProvisionerOptions, data x509util.TemplateData) (Certifi
 
 		// Add template data if any.
 		if len(o.TemplateData) > 0 {
-			if err := json.Unmarshal(o.TemplateData, data); err != nil {
+			if err := json.Unmarshal(o.TemplateData, &data); err != nil {
 				return nil, errors.Wrap(err, "error unmarshaling template data")
 			}
 		}
@@ -52,9 +52,9 @@ func TemplateOptions(o *ProvisionerOptions, data x509util.TemplateData) (Certifi
 		}
 
 		// Add user provided data.
-		if len(so.UserData) > 0 {
+		if len(so.TemplateData) > 0 {
 			userObject := make(map[string]interface{})
-			if err := json.Unmarshal(so.UserData, userObject); err != nil {
+			if err := json.Unmarshal(so.TemplateData, &userObject); err != nil {
 				data[x509util.UserKey] = map[string]interface{}{}
 			} else {
 				data[x509util.UserKey] = userObject
diff --git a/authority/provisioner/sign_options.go b/authority/provisioner/sign_options.go
index bd3a6821..bcf19ff2 100644
--- a/authority/provisioner/sign_options.go
+++ b/authority/provisioner/sign_options.go
@@ -22,7 +22,7 @@ import (
 type Options struct {
 	NotAfter  TimeDuration    `json:"notAfter"`
 	NotBefore TimeDuration    `json:"notBefore"`
-	UserData  json.RawMessage `json:"data"`
+	TemplateData  json.RawMessage `json:"templateData"`
 	Backdate  time.Duration   `json:"-"`
 }