diff --git a/okta/resource_okta_user_base_schema.go b/okta/resource_okta_user_base_schema.go
index e7ab3d33..5e9b171e 100644
--- a/okta/resource_okta_user_base_schema.go
+++ b/okta/resource_okta_user_base_schema.go
@@ -15,7 +15,10 @@ func resourceUserBaseSchema() *schema.Resource {
 		Delete: resourceUserBaseSchemaDelete,
 		Exists: resourceUserBaseSchemaExists,
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			State: func(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
+				d.Set("index", d.Id())
+				return []*schema.ResourceData{d}, nil
+			},
 		},
 
 		Schema: userBaseSchemaSchema,
diff --git a/okta/resource_okta_user_schema.go b/okta/resource_okta_user_schema.go
index 088475c0..4acb8282 100644
--- a/okta/resource_okta_user_schema.go
+++ b/okta/resource_okta_user_schema.go
@@ -15,7 +15,10 @@ func resourceUserSchema() *schema.Resource {
 		Delete: resourceUserSchemaDelete,
 		Exists: resourceUserSchemaExists,
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			State: func(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
+				d.Set("index", d.Id())
+				return []*schema.ResourceData{d}, nil
+			},
 		},
 		Schema: userSchemaSchema,
 	}
diff --git a/okta/user_schema.go b/okta/user_schema.go
index 15459775..aaafc288 100644
--- a/okta/user_schema.go
+++ b/okta/user_schema.go
@@ -189,8 +189,6 @@ func buildCustomUserSchema(target map[string]*schema.Schema) map[string]*schema.
 }
 
 func syncUserSchema(d *schema.ResourceData, subschema *sdk.UserSubSchema) error {
-	// Syncing it so it shows up in import plan
-	d.Set("index", d.Get("index").(string))
 	d.Set("title", subschema.Title)
 	d.Set("type", subschema.Type)
 	d.Set("description", subschema.Description)
@@ -219,8 +217,6 @@ func syncUserSchema(d *schema.ResourceData, subschema *sdk.UserSubSchema) error
 }
 
 func syncBaseUserSchema(d *schema.ResourceData, subschema *sdk.UserSubSchema) {
-	// Syncing it so it shows up in import plan
-	d.Set("index", d.Get("index").(string))
 	d.Set("title", subschema.Title)
 	d.Set("type", subschema.Type)
 	d.Set("required", subschema.Required)