diff --git a/public/app/features/datasources/partials/http_settings.html b/public/app/features/datasources/partials/http_settings.html
index 78fb24c6093..a43951d35a2 100644
--- a/public/app/features/datasources/partials/http_settings.html
+++ b/public/app/features/datasources/partials/http_settings.html
@@ -88,17 +88,7 @@
 			  checked="current.jsonData.tlsSkipVerify" switch-class="max-width-6"></gf-form-checkbox>
 		</div>
 		<div class="gf-form-inline">
-			<gf-form-switch class="gf-form" ng-if="current.access=='proxy'" label="Forward OAuth Identity" label-class="width-13" tooltip="Forward the user's upstream OAuth identity to the datasource (Their access token gets passed along)." label-class="width-10" checked="current.jsonData.oauthPassThru" switch-class="max-width-6"></gf-form-switch>
-		</div>
-	</div>
-
-	<div class="gf-form-group" ng-if="current.jsonData.oauthPassThru">
-		<h6>OAuth Identity Forwarding Details</h6>
-		<div class="gf-form max-width-30">
-			<span class="gf-form-label width-10">OAuth Source</span>
-			<div class="gf-form-select-wrapper max-width-24">
-				<select class="gf-form-input" ng-model="current.jsonData.oauthPassThruProvider" ng-options="f.key as f.value for f in oauthProviders"></select>
-			</div>
+			<gf-form-checkbox class="gf-form" ng-if="current.access=='proxy'" label="Forward OAuth Identity" label-class="width-13" tooltip="Forward the user's upstream OAuth identity to the datasource (Their access token gets passed along)." checked="current.jsonData.oauthPassThru" switch-class="max-width-6"></gf-form-checkbox>
 		</div>
 	</div>
 
diff --git a/public/app/features/datasources/settings/HttpSettingsCtrl.ts b/public/app/features/datasources/settings/HttpSettingsCtrl.ts
index e26fc5ab719..47022c283f8 100644
--- a/public/app/features/datasources/settings/HttpSettingsCtrl.ts
+++ b/public/app/features/datasources/settings/HttpSettingsCtrl.ts
@@ -20,13 +20,6 @@ coreModule.directive('datasourceHttpSettings', () => {
         $scope.getSuggestUrls = () => {
           return [$scope.suggestUrl];
         };
-        $scope.oauthProviders = [
-          { key: 'oauth_google', value: 'Google OAuth' },
-          { key: 'oauth_gitlab', value: 'GitLab OAuth' },
-          { key: 'oauth_generic_oauth', value: 'Generic OAuth' },
-          { key: 'oauth_grafana_com', value: 'Grafana OAuth' },
-          { key: 'oauth_github', value: 'GitHub OAuth' },
-        ];
       },
     },
   };