diff --git a/github/provider.go b/github/provider.go
index f5d98f7f6b..193d520521 100644
--- a/github/provider.go
+++ b/github/provider.go
@@ -15,16 +15,18 @@ func Provider() terraform.ResourceProvider {
 				Description: descriptions["token"],
 			},
 			"owner": {
-				Type:        schema.TypeString,
-				Optional:    true,
-				DefaultFunc: OwnerOrOrgEnvDefaultFunc,
-				Description: descriptions["owner"],
+				Type:          schema.TypeString,
+				Optional:      true,
+				DefaultFunc:   schema.EnvDefaultFunc("GITHUB_OWNER", nil),
+				Description:   descriptions["owner"],
+				ConflictsWith: []string{"organization"},
 			},
 			"organization": {
-				Type:        schema.TypeString,
-				Optional:    true,
-				DefaultFunc: OwnerOrOrgEnvDefaultFunc,
-				Description: descriptions["organization"],
+				Type:          schema.TypeString,
+				Optional:      true,
+				DefaultFunc:   schema.EnvDefaultFunc("GITHUB_ORGANIZATION", nil),
+				Description:   descriptions["organization"],
+				ConflictsWith: []string{"owner"},
 			},
 			"base_url": {
 				Type:        schema.TypeString,