diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94852d43047..1d656e3685c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 2.0.3 (unreleased)
+
+**Fixes**
+- [Issue #1857](https://github.com/grafana/grafana/issues/1857). /api/login/ping Fix for issue when behind reverse proxy and subpath
+
 # 2.0.2 (2015-04-22)
 
 **Fixes**
diff --git a/package.json b/package.json
index 0ff6bf8b480..64e393616f6 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
     "company": "Coding Instinct AB"
   },
   "name": "grafana",
-  "version": "2.0.2",
+  "version": "2.0.3-pre1",
   "repository": {
     "type": "git",
     "url": "http://github.com/torkelo/grafana.git"
diff --git a/public/app/services/backendSrv.js b/public/app/services/backendSrv.js
index 30cad361bbe..c208fe3388e 100644
--- a/public/app/services/backendSrv.js
+++ b/public/app/services/backendSrv.js
@@ -63,8 +63,9 @@ function (angular, _, config) {
       var requestIsLocal = options.url.indexOf('/') === 0;
       var firstAttempt = options.retry === 0;
 
-      if (requestIsLocal && firstAttempt) {
+      if (requestIsLocal && !options.hasSubUrl) {
         options.url = config.appSubUrl + options.url;
+        options.hasSubUrl = true;
       }
 
       return $http(options).then(function(results) {