diff --git a/pkg/api/folder.go b/pkg/api/folder.go
index 280fbb5a804..4373bb2d54f 100644
--- a/pkg/api/folder.go
+++ b/pkg/api/folder.go
@@ -227,30 +227,28 @@ func (hs *HTTPServer) newToFolderDto(c *models.ReqContext, g guardian.DashboardG
 
 	// Finding creator and last updater of the folder
 	updater, creator := anonString, anonString
-	/*
-		if folder.CreatedBy > 0 {
-			creator = hs.getUserLogin(c.Req.Context(), folder.CreatedBy)
-		}
-		if folder.UpdatedBy > 0 {
-			updater = hs.getUserLogin(c.Req.Context(), folder.UpdatedBy)
-		}
-	*/
+	if folder.CreatedBy > 0 {
+		creator = hs.getUserLogin(c.Req.Context(), folder.CreatedBy)
+	}
+	if folder.UpdatedBy > 0 {
+		updater = hs.getUserLogin(c.Req.Context(), folder.UpdatedBy)
+	}
 
 	return dtos.Folder{
-		Id:    folder.ID,
-		Uid:   folder.UID,
-		Title: folder.Title,
-		//Url:           folder.Url,
-		//HasACL:        folder.HasACL,
-		CanSave:   canSave,
-		CanEdit:   canEdit,
-		CanAdmin:  canAdmin,
-		CanDelete: canDelete,
-		CreatedBy: creator,
-		Created:   folder.Created,
-		UpdatedBy: updater,
-		Updated:   folder.Updated,
-		//Version:       folder.Version,
+		Id:            folder.ID,
+		Uid:           folder.UID,
+		Title:         folder.Title,
+		Url:           folder.Url,
+		HasACL:        folder.HasACL,
+		CanSave:       canSave,
+		CanEdit:       canEdit,
+		CanAdmin:      canAdmin,
+		CanDelete:     canDelete,
+		CreatedBy:     creator,
+		Created:       folder.Created,
+		UpdatedBy:     updater,
+		Updated:       folder.Updated,
+		Version:       folder.Version,
 		AccessControl: hs.getAccessControlMetadata(c, c.OrgID, dashboards.ScopeFoldersPrefix, folder.UID),
 	}
 }
diff --git a/pkg/services/folder/model.go b/pkg/services/folder/model.go
index fe18991393a..ea736371ef5 100644
--- a/pkg/services/folder/model.go
+++ b/pkg/services/folder/model.go
@@ -34,11 +34,11 @@ type Folder struct {
 
 	// TODO: validate if this field is required/relevant to folders.
 	// currently there is no such column
-	// Version   int
-	// Url       string
-	// UpdatedBy int64
-	// CreatedBy int64
-	// HasACL    bool
+	Version   int
+	Url       string
+	UpdatedBy int64
+	CreatedBy int64
+	HasACL    bool
 }
 
 type FolderDTO struct {
@@ -142,15 +142,15 @@ func (f *Folder) ToLegacyModel() *models.Folder {
 
 func FromDashboard(dash *models.Dashboard) *Folder {
 	return &Folder{
-		ID:    dash.Id,
-		UID:   dash.Uid,
-		Title: dash.Title,
-		//HasACL:    dash.HasACL,
-		//Url:       dash.GetUrl(),
-		//Version:   dash.Version,
-		Created: dash.Created,
-		//CreatedBy: dash.CreatedBy,
-		Updated: dash.Updated,
-		//UpdatedBy: dash.UpdatedBy,
+		ID:        dash.Id,
+		UID:       dash.Uid,
+		Title:     dash.Title,
+		HasACL:    dash.HasACL,
+		Url:       models.GetFolderUrl(dash.Uid, dash.Slug),
+		Version:   dash.Version,
+		Created:   dash.Created,
+		CreatedBy: dash.CreatedBy,
+		Updated:   dash.Updated,
+		UpdatedBy: dash.UpdatedBy,
 	}
 }