diff --git a/src/app/features/org/datasourceEditCtrl.js b/src/app/features/org/datasourceEditCtrl.js
index db09d632d4a..913c45fcd67 100644
--- a/src/app/features/org/datasourceEditCtrl.js
+++ b/src/app/features/org/datasourceEditCtrl.js
@@ -10,6 +10,8 @@ function (angular) {
 
   module.controller('DataSourceEditCtrl', function($scope, $q, backendSrv, $routeParams, $location, datasourceSrv) {
 
+    $scope.httpConfigPartialSrc = 'app/features/org/partials/datasourceHttpConfig.html';
+
     var defaults = {
       name: '',
       type: 'graphite',
diff --git a/src/app/features/org/partials/datasourceEdit.html b/src/app/features/org/partials/datasourceEdit.html
index db711831783..12b46ee284b 100644
--- a/src/app/features/org/partials/datasourceEdit.html
+++ b/src/app/features/org/partials/datasourceEdit.html
@@ -30,7 +30,7 @@
 				</ul>
 				<div class="clearfix"></div>
 			</div>
-			<div class="tight-form">
+			<div class="tight-form last">
 				<ul class="tight-form-list">
 					<li class="tight-form-item" style="width: 80px">
 						Type
@@ -42,54 +42,9 @@
 				<div class="clearfix"></div>
 			</div>
 
-			<br>
-			<h5>Http settings</h5>
-			<div class="tight-form">
-				<ul class="tight-form-list">
-					<li class="tight-form-item" style="width: 80px">
-						Url
-					</li>
-					<li>
-						<input type="text" class="tight-form-input input-xlarge" ng-model='current.url' placeholder="http://my.server.com:8080" required></input>
-					</li>
-					<li class="tight-form-item">
-					  Access <tip>Direct = url is used directly from browser, Proxy = Grafana backend will proxy the request</label>
-					</li>
-					<li>
-						<select class="input-medium tight-form-input" ng-model="current.access" ng-options="f for f in ['direct', 'proxy']"></select>
-					</li>
-				</ul>
-				<div class="clearfix"></div>
-			</div>
-			<div class="tight-form last">
-				<ul class="tight-form-list">
-					<li class="tight-form-item" style="width: 80px">
-						Basic Auth
-					</li>
-					<li class="tight-form-item">
-						Enable&nbsp;
-						<input class="cr1" id="current.basicAuth" type="checkbox" ng-model="current.basicAuth" ng-checked="current.basicAuth">
-						<label for="current.basicAuth" class="cr1"></label>
-					</li>
-					<li class="tight-form-item" ng-if="current.basicAuth">
-						User
-					</li>
-					<li ng-if="current.basicAuth">
-						<input type="text" class="tight-form-input input-medium" style="width: 139px" ng-model='current.basicAuthUser' placeholder="user" required></input>
-					</li>
-					<li class="tight-form-item" style="width: 67px" ng-if="current.basicAuth">
-						Password
-					</li>
-					<li ng-if="current.basicAuth">
-						<input type="password" class="tight-form-input input-medium" ng-model='current.basicAuthPassword' placeholder="password" required></input>
-					</li>
-				</ul>
-				<div class="clearfix"></div>
-			</div>
-
-			<br>
 			<div ng-include="datasourceMeta.partials.config" ng-if="datasourceMeta.partials.config"></div>
 			<br>
+			<br>
 			<div class="pull-right">
 				<button type="submit" class="btn btn-success" ng-show="isNew" ng-click="add()">Add</button>
 				<button type="submit" class="btn btn-success" ng-show="!isNew" ng-click="update()">Update</button>
diff --git a/src/app/features/org/partials/datasourceHttpConfig.html b/src/app/features/org/partials/datasourceHttpConfig.html
new file mode 100644
index 00000000000..88923e77b3d
--- /dev/null
+++ b/src/app/features/org/partials/datasourceHttpConfig.html
@@ -0,0 +1,46 @@
+<br>
+<h5>Http settings</h5>
+<div class="tight-form">
+	<ul class="tight-form-list">
+		<li class="tight-form-item" style="width: 80px">
+			Url
+		</li>
+		<li>
+			<input type="text" class="tight-form-input input-xlarge" ng-model='current.url' placeholder="http://my.server.com:8080" required></input>
+		</li>
+		<li class="tight-form-item">
+			Access <tip>Direct = url is used directly from browser, Proxy = Grafana backend will proxy the request</label>
+	  </li>
+		<li>
+			<select class="input-medium tight-form-input" ng-model="current.access" ng-options="f for f in ['direct', 'proxy']"></select>
+		</li>
+	</ul>
+	<div class="clearfix"></div>
+</div>
+<div class="tight-form last">
+	<ul class="tight-form-list">
+		<li class="tight-form-item" style="width: 80px">
+			Basic Auth
+		</li>
+		<li class="tight-form-item">
+			Enable&nbsp;
+			<input class="cr1" id="current.basicAuth" type="checkbox" ng-model="current.basicAuth" ng-checked="current.basicAuth">
+			<label for="current.basicAuth" class="cr1"></label>
+		</li>
+		<li class="tight-form-item" ng-if="current.basicAuth">
+			User
+		</li>
+		<li ng-if="current.basicAuth">
+			<input type="text" class="tight-form-input input-medium" style="width: 139px" ng-model='current.basicAuthUser' placeholder="user" required></input>
+		</li>
+		<li class="tight-form-item" style="width: 67px" ng-if="current.basicAuth">
+			Password
+		</li>
+		<li ng-if="current.basicAuth">
+			<input type="password" class="tight-form-input input-medium" ng-model='current.basicAuthPassword' placeholder="password" required></input>
+		</li>
+	</ul>
+	<div class="clearfix"></div>
+</div>
+
+
diff --git a/src/app/plugins/datasource/elasticsearch/partials/config.html b/src/app/plugins/datasource/elasticsearch/partials/config.html
index 2ebdf43a486..d520053e13c 100644
--- a/src/app/plugins/datasource/elasticsearch/partials/config.html
+++ b/src/app/plugins/datasource/elasticsearch/partials/config.html
@@ -1,3 +1,6 @@
+<div ng-include="httpConfigPartialSrc"></div>
+
+<br>
 <h5>Elastic search details</h5>
 
 <div class="tight-form last">
diff --git a/src/app/plugins/datasource/graphite/partials/config.html b/src/app/plugins/datasource/graphite/partials/config.html
index e69de29bb2d..0b454f4dc74 100644
--- a/src/app/plugins/datasource/graphite/partials/config.html
+++ b/src/app/plugins/datasource/graphite/partials/config.html
@@ -0,0 +1,3 @@
+<div ng-include="httpConfigPartialSrc"></div>
+
+
diff --git a/src/app/plugins/datasource/influxdb/partials/config.html b/src/app/plugins/datasource/influxdb/partials/config.html
index 541db7cd15d..0c05f8f5bd1 100644
--- a/src/app/plugins/datasource/influxdb/partials/config.html
+++ b/src/app/plugins/datasource/influxdb/partials/config.html
@@ -1,3 +1,7 @@
+<div ng-include="httpConfigPartialSrc"></div>
+
+<br>
+
 <h5>InfluxDB Details</h5>
 
 <div class="tight-form">
diff --git a/src/app/plugins/datasource/influxdb/plugin.json b/src/app/plugins/datasource/influxdb/plugin.json
index c93b41747a7..40c5fc9cea9 100644
--- a/src/app/plugins/datasource/influxdb/plugin.json
+++ b/src/app/plugins/datasource/influxdb/plugin.json
@@ -13,6 +13,5 @@
     "annotations": "app/plugins/datasource/influxdb/partials/annotations.editor.html"
   },
 
-  "metrics": true,
-  "annotations": true
+  "metrics": true
 }
diff --git a/src/app/plugins/datasource/influxdb_08/partials/config.html b/src/app/plugins/datasource/influxdb_08/partials/config.html
index 541db7cd15d..0c05f8f5bd1 100644
--- a/src/app/plugins/datasource/influxdb_08/partials/config.html
+++ b/src/app/plugins/datasource/influxdb_08/partials/config.html
@@ -1,3 +1,7 @@
+<div ng-include="httpConfigPartialSrc"></div>
+
+<br>
+
 <h5>InfluxDB Details</h5>
 
 <div class="tight-form">
diff --git a/src/app/plugins/datasource/opentsdb/partials/config.html b/src/app/plugins/datasource/opentsdb/partials/config.html
index e69de29bb2d..bb5bdda1e20 100644
--- a/src/app/plugins/datasource/opentsdb/partials/config.html
+++ b/src/app/plugins/datasource/opentsdb/partials/config.html
@@ -0,0 +1,4 @@
+<div ng-include="httpConfigPartialSrc"></div>
+
+<br>
+