diff --git a/conf/grafana.dev.ini b/conf/grafana.dev.ini
index 043006518b5..06cc377eb6b 100644
--- a/conf/grafana.dev.ini
+++ b/conf/grafana.dev.ini
@@ -3,7 +3,6 @@ app_mode = development
 [server]
 router_logging = false
 static_root_path = grafana/src
-root_url = %(protocol)s://%(domain)s:%(http_port)s/
 
 [oauth]
 enabled = true
diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go
index 35be8d48c68..4fab62dfea7 100644
--- a/pkg/api/login_oauth.go
+++ b/pkg/api/login_oauth.go
@@ -76,5 +76,5 @@ func OAuthLogin(ctx *middleware.Context) {
 	// login
 	loginUserWithAccount(userQuery.Result, ctx)
 
-	ctx.Redirect("/")
+	ctx.Redirect(setting.AppSubUrl + "/")
 }