diff --git a/pkg/api/api.go b/pkg/api/api.go
index 430b81f2380..4cebd56d5b1 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -34,6 +34,7 @@ func Register(r *macaron.Macaron) {
 	r.Get("/org/", reqSignedIn, Index)
 	r.Get("/org/new", reqSignedIn, Index)
 	r.Get("/datasources/", reqSignedIn, Index)
+	r.Get("/datasources/new", reqSignedIn, Index)
 	r.Get("/datasources/edit/*", reqSignedIn, Index)
 	r.Get("/org/users/", reqSignedIn, Index)
 	r.Get("/org/apikeys/", reqSignedIn, Index)
diff --git a/public/app/features/plugins/ds_edit_ctrl.ts b/public/app/features/plugins/ds_edit_ctrl.ts
index c33fe5a3b3d..0f234fb6b90 100644
--- a/public/app/features/plugins/ds_edit_ctrl.ts
+++ b/public/app/features/plugins/ds_edit_ctrl.ts
@@ -168,15 +168,13 @@ coreModule.directive('datasourceHttpSettings', function() {
   return {
     scope: {
       current: "=",
-      defaultUrl: "="
+      suggestUrl: "@",
     },
     templateUrl: 'public/app/features/plugins/partials/ds_http_settings.html',
     link: {
       pre: function($scope, elem, attrs) {
-        $scope.suggestDefaultUrl = function() {
-          return [
-            $scope.defaultUrl
-          ];
+        $scope.getSuggestUrls = function() {
+          return [$scope.suggestUrl];
         };
       }
     }
diff --git a/public/app/features/plugins/partials/ds_http_settings.html b/public/app/features/plugins/partials/ds_http_settings.html
index 90feed80935..0022f6e6c19 100644
--- a/public/app/features/plugins/partials/ds_http_settings.html
+++ b/public/app/features/plugins/partials/ds_http_settings.html
@@ -6,7 +6,10 @@
 	<div class="gf-form-inline">
 		<div class="gf-form max-width-30">
 			<span class="gf-form-label width-7">Url</span>
-			<input class="gf-form-input" type="text" ng-model='current.url' placeholder="for example: http://localhost:8081" bs-typeahead="suggestDefaultUrl" ng-pattern="/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/" required></input>
+			<input class="gf-form-input" type="text"
+						 ng-model='current.url' placeholder="{{suggestUrl}}"
+						 bs-typeahead="getSuggestUrls"  min-length="0"
+						 ng-pattern="/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/" required></input>
 			<info-popover mode="right-absolute">
 				<p>Specify a complete HTTP url (for example http://your_server:8080)</p>
 				<span ng-show="current.access === 'direct'">
diff --git a/public/app/plugins/datasource/elasticsearch/partials/config.html b/public/app/plugins/datasource/elasticsearch/partials/config.html
index 85554b59988..03662a9693b 100644
--- a/public/app/plugins/datasource/elasticsearch/partials/config.html
+++ b/public/app/plugins/datasource/elasticsearch/partials/config.html
@@ -1,4 +1,4 @@
-<datasource-http-settings current="ctrl.current">
+<datasource-http-settings current="ctrl.current" suggest-url="http://localhost:9200">
 </datasource-http-settings>
 
 <h3 class="page-heading">Elasticsearch details</h3>
diff --git a/public/app/plugins/datasource/graphite/partials/config.html b/public/app/plugins/datasource/graphite/partials/config.html
index 44dc639c0b0..7356c8948e4 100644
--- a/public/app/plugins/datasource/graphite/partials/config.html
+++ b/public/app/plugins/datasource/graphite/partials/config.html
@@ -1,3 +1,5 @@
-<datasource-http-settings current="ctrl.current" default-url="'http://localhost:8081'">
+<datasource-http-settings
+	current="ctrl.current"
+	suggest-url="http://localhost:8080">
 </datasource-http-settings>
 
diff --git a/public/app/plugins/datasource/influxdb/partials/config.html b/public/app/plugins/datasource/influxdb/partials/config.html
index 9a1d326ca64..8c09c637906 100644
--- a/public/app/plugins/datasource/influxdb/partials/config.html
+++ b/public/app/plugins/datasource/influxdb/partials/config.html
@@ -1,4 +1,4 @@
-<datasource-http-settings current="ctrl.current">
+<datasource-http-settings current="ctrl.current" suggest-url="http://localhost:8086">
 </datasource-http-settings>
 
 <h3 class="page-heading">InfluxDB Details</h3>
diff --git a/public/app/plugins/datasource/opentsdb/partials/config.html b/public/app/plugins/datasource/opentsdb/partials/config.html
index 1006ef97d32..b15f22dcc5b 100644
--- a/public/app/plugins/datasource/opentsdb/partials/config.html
+++ b/public/app/plugins/datasource/opentsdb/partials/config.html
@@ -1,6 +1,6 @@
-<datasource-http-settings current="ctrl.current"></datasource-http-settings>
+<datasource-http-settings current="ctrl.current" suggest-url="http://localhost:4242"></datasource-http-settings>
 
-<h5>Opentsdb settings</h5>
+<h5>OpenTSDB settings</h5>
 <div class="gf-form">
   <span class="gf-form-label width-7">
     Version
diff --git a/public/app/plugins/datasource/prometheus/partials/config.html b/public/app/plugins/datasource/prometheus/partials/config.html
index d7a0f739ccb..1b817a2186d 100644
--- a/public/app/plugins/datasource/prometheus/partials/config.html
+++ b/public/app/plugins/datasource/prometheus/partials/config.html
@@ -1,3 +1,3 @@
-<datasource-http-settings current="ctrl.current">
+<datasource-http-settings current="ctrl.current" suggest-url="http://localhost:9090">
 </datasource-http-settings>