diff --git a/pagerduty/resource_pagerduty_service_event_orchestration_active.go b/pagerduty/resource_pagerduty_service_event_orchestration_active.go
index 6b44be16c..6a979a73d 100644
--- a/pagerduty/resource_pagerduty_service_event_orchestration_active.go
+++ b/pagerduty/resource_pagerduty_service_event_orchestration_active.go
@@ -84,9 +84,9 @@ func resourcePagerDutyServiceEventOrchestrationActiveCreate(ctx context.Context,
 
 	log.Printf("[INFO] Changing PagerDuty event orchestration status to %t for service: %s", status, service)
 
-	retryErr := resource.RetryContext(ctx, 10*time.Minute, func() *resource.RetryError {
+	retryErr := resource.RetryContext(ctx, 2*time.Minute, func() *resource.RetryError {
 		if eventOrchestrationStatus, _, err := client.ServiceEventOrchestrationActive.Create(service, eventOrchestrationActive); err != nil {
-			if isErrCode(err, 400) {
+			if isErrCode(err, 400) || isErrCode(err, 403) {
 				time.Sleep(2 * time.Second)
 				return resource.RetryableError(err)
 			}
diff --git a/pagerduty/resource_pagerduty_user.go b/pagerduty/resource_pagerduty_user.go
index 12ffae37a..b79d25c67 100644
--- a/pagerduty/resource_pagerduty_user.go
+++ b/pagerduty/resource_pagerduty_user.go
@@ -201,7 +201,10 @@ func resourcePagerDutyUserRead(ctx context.Context, d *schema.ResourceData, meta
 		d.Set("avatar_url", user.AvatarURL)
 		d.Set("description", user.Description)
 		d.Set("job_title", user.JobTitle)
-		d.Set("license", user.License.ID)
+
+		if user.License != nil {
+			d.Set("license", user.License.ID)
+		}
 
 		if err := d.Set("teams", flattenTeams(user.Teams)); err != nil {
 			return resource.NonRetryableError(