diff --git a/azuread/helpers/graph/credentials.go b/azuread/helpers/graph/credentials.go
index f225cfe5d..4893c7942 100644
--- a/azuread/helpers/graph/credentials.go
+++ b/azuread/helpers/graph/credentials.go
@@ -59,20 +59,20 @@ func PasswordResourceSchema(object_type string) map[string]*schema.Schema {
 		},
 
 		"end_date": {
-			Type:          schema.TypeString,
-			Optional:      true,
-			Computed:      true,
-			ForceNew:      true,
-			ConflictsWith: []string{"end_date_relative"},
-			ValidateFunc:  validation.IsRFC3339Time,
+			Type:         schema.TypeString,
+			Optional:     true,
+			Computed:     true,
+			ForceNew:     true,
+			ExactlyOneOf: []string{"end_date_relative"},
+			ValidateFunc: validation.IsRFC3339Time,
 		},
 
 		"end_date_relative": {
-			Type:          schema.TypeString,
-			Optional:      true,
-			ForceNew:      true,
-			ConflictsWith: []string{"end_date"},
-			ValidateFunc:  validate.NoEmptyStrings,
+			Type:         schema.TypeString,
+			Optional:     true,
+			ForceNew:     true,
+			ExactlyOneOf: []string{"end_date"},
+			ValidateFunc: validate.NoEmptyStrings,
 		},
 	}
 }
diff --git a/website/docs/r/application_password.html.markdown b/website/docs/r/application_password.html.markdown
index fdb3bf8f1..0dd0732c1 100644
--- a/website/docs/r/application_password.html.markdown
+++ b/website/docs/r/application_password.html.markdown
@@ -26,10 +26,10 @@ resource "azuread_application" "example" {
 }
 
 resource "azuread_application_password" "example" {
-  application_id = "${azuread_application.example.id}"
-  description    = "My managed password"
-  value          = "VT=uSgbTanZhyz@%nL9Hpd+Tfay_MRV#"
-  end_date       = "2099-01-01T01:02:03Z"
+  application_object_id = "${azuread_application.example.id}"
+  description           = "My managed password"
+  value                 = "VT=uSgbTanZhyz@%nL9Hpd+Tfay_MRV#"
+  end_date              = "2099-01-01T01:02:03Z"
 }
 ```