diff --git a/src/app/services/graphite/graphiteDatasource.js b/src/app/services/graphite/graphiteDatasource.js
index 2f735412dd2..c137b79990e 100644
--- a/src/app/services/graphite/graphiteDatasource.js
+++ b/src/app/services/graphite/graphiteDatasource.js
@@ -14,7 +14,15 @@ function (angular, _, $, config, kbn, moment) {
   module.factory('GraphiteDatasource', function(dashboard, $q, filterSrv, $http) {
 
     function GraphiteDatasource(datasource) {
-      this.url = datasource.url;
+      var passwordEnd = datasource.url.indexOf('@');
+      if(passwordEnd > 0) {
+        var userStart = datasource.url.indexOf('//') + 2;
+        var urlHead = datasource.url.substring(0,userStart);
+        this.url = urlHead + datasource.url.substring(passwordEnd);
+      }
+      else {
+        this.url = datasource.url;
+      }
       this.type = 'graphite';
       this.basicAuth = datasource.basicAuth;
     }