diff --git a/pkg/api/org.go b/pkg/api/org.go
index 75499f33f61..b38eb537ae9 100644
--- a/pkg/api/org.go
+++ b/pkg/api/org.go
@@ -6,6 +6,7 @@ import (
 	"github.com/grafana/grafana/pkg/middleware"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util"
 )
 
 // GET /api/org
@@ -50,7 +51,10 @@ func CreateOrg(c *middleware.Context, cmd m.CreateOrgCommand) Response {
 
 	metrics.M_Api_Org_Create.Inc(1)
 
-	return ApiSuccess("Organization created")
+	return Json(200, &util.DynMap{
+		"orgId":   cmd.Result.Id,
+		"message": "Organization created",
+	})
 }
 
 // PUT /api/org
diff --git a/public/app/features/org/newOrgCtrl.js b/public/app/features/org/newOrgCtrl.js
index 9d81e226dce..220192a46ac 100644
--- a/public/app/features/org/newOrgCtrl.js
+++ b/public/app/features/org/newOrgCtrl.js
@@ -1,7 +1,8 @@
 define([
   'angular',
+  'config',
 ],
-function (angular) {
+function (angular, config) {
   'use strict';
 
   var module = angular.module('grafana.controllers');
@@ -11,7 +12,11 @@ function (angular) {
     $scope.newOrg = {name: ''};
 
     $scope.createOrg = function() {
-      backendSrv.post('/api/orgs/', $scope.newOrg).then($scope.getUserOrgs);
+      backendSrv.post('/api/orgs/', $scope.newOrg).then(function(result) {
+        backendSrv.post('/api/user/using/' + result.orgId).then(function() {
+          window.location.href = config.appSubUrl + '/org';
+        });
+      });
     };
 
   });