diff --git a/google/resource_sql_user.go b/google/resource_sql_user.go
index 4f76724d96a..045a85b1219 100644
--- a/google/resource_sql_user.go
+++ b/google/resource_sql_user.go
@@ -43,7 +43,7 @@ func resourceSqlUser() *schema.Resource {
 
 			"password": &schema.Schema{
 				Type:      schema.TypeString,
-				Required:  true,
+				Optional:  true,
 				Sensitive: true,
 			},
 
diff --git a/google/resource_sql_user_test.go b/google/resource_sql_user_test.go
index 87fc0f8e36b..718e5839267 100644
--- a/google/resource_sql_user_test.go
+++ b/google/resource_sql_user_test.go
@@ -140,7 +140,6 @@ func testGoogleSqlUser_basic2(instance, user string) string {
 		name = "user%s"
 		instance = "${google_sql_database_instance.instance.name}"
 		host = "google.com"
-		password = "oops"
 	}
 	`, instance, user)
 }
diff --git a/website/docs/r/sql_user.html.markdown b/website/docs/r/sql_user.html.markdown
index 36186ad684d..5b366bda4df 100644
--- a/website/docs/r/sql_user.html.markdown
+++ b/website/docs/r/sql_user.html.markdown
@@ -48,7 +48,7 @@ The following arguments are supported:
 * `name` - (Required) The name of the user. Changing this forces a new resource
     to be created.
 
-* `password` - (Required) The users password. Can be updated.
+* `password` - (Optional) The users password. Can be updated.
 
 - - -