diff --git a/pkg/api/user.go b/pkg/api/user.go
index 8bc33207ac1..b9c4de2175a 100644
--- a/pkg/api/user.go
+++ b/pkg/api/user.go
@@ -122,6 +122,7 @@ func (hs *HTTPServer) GetUserByLoginOrEmail(c *contextmodel.ReqContext) response
 		Login:          usr.Login,
 		Theme:          usr.Theme,
 		IsGrafanaAdmin: usr.IsAdmin,
+		IsDisabled:     usr.IsDisabled,
 		OrgID:          usr.OrgID,
 		UpdatedAt:      usr.Updated,
 		CreatedAt:      usr.Created,
diff --git a/pkg/api/user_test.go b/pkg/api/user_test.go
index c452802bba4..6dc94f4468c 100644
--- a/pkg/api/user_test.go
+++ b/pkg/api/user_test.go
@@ -93,10 +93,11 @@ func TestUserAPIEndpoint_userLoggedIn(t *testing.T) {
 		hs.userService = userSvc
 
 		createUserCmd := user.CreateUserCommand{
-			Email:   fmt.Sprint("user", "@test.com"),
-			Name:    "user",
-			Login:   "loginuser",
-			IsAdmin: true,
+			Email:      fmt.Sprint("user", "@test.com"),
+			Name:       "user",
+			Login:      "loginuser",
+			IsAdmin:    true,
+			IsDisabled: true,
 		}
 		usr, err := userSvc.Create(context.Background(), &createUserCmd)
 		require.NoError(t, err)
@@ -133,6 +134,7 @@ func TestUserAPIEndpoint_userLoggedIn(t *testing.T) {
 			Login:          "loginuser",
 			OrgID:          1,
 			IsGrafanaAdmin: true,
+			IsDisabled:     true,
 			AuthLabels:     []string{},
 			CreatedAt:      fakeNow,
 			UpdatedAt:      fakeNow,