diff --git a/src/Admin/Views/Organizations/View.cshtml b/src/Admin/Views/Organizations/View.cshtml
new file mode 100644
index 0000000000..9d5c7fafeb
--- /dev/null
+++ b/src/Admin/Views/Organizations/View.cshtml
@@ -0,0 +1,13 @@
+@model OrganizationViewModel
+@{
+ ViewData["Title"] = "Organization: " + Model.Organization.Name;
+}
+
+
Organization @Model.Organization.Name
+
+
Information
+@Html.Partial("_ViewInformation", Model)
+
diff --git a/src/Admin/Views/Organizations/_ViewInformation.cshtml b/src/Admin/Views/Organizations/_ViewInformation.cshtml
new file mode 100644
index 0000000000..6a80a398fd
--- /dev/null
+++ b/src/Admin/Views/Organizations/_ViewInformation.cshtml
@@ -0,0 +1,20 @@
+@model OrganizationViewModel
+
+ - Id
+ @Model.Organization.Id
+
+ - Users
+ - @Model.UserCount
+
+ - Owners
+ - @(string.IsNullOrWhiteSpace(Model.Owners) ? "None" : Model.Owners)
+
+ - Admins
+ - @(string.IsNullOrWhiteSpace(Model.Admins) ? "None" : Model.Admins)
+
+ - Created
+ - @Model.Organization.CreationDate.ToString()
+
+ - Modified
+ - @Model.Organization.RevisionDate.ToString()
+
diff --git a/src/Admin/Views/Users/Edit.cshtml b/src/Admin/Views/Users/Edit.cshtml
index 5e9d992ead..bbae6c5b03 100644
--- a/src/Admin/Views/Users/Edit.cshtml
+++ b/src/Admin/Views/Users/Edit.cshtml
@@ -57,22 +57,7 @@
User @Model.User.Email
Information
-
- - Id
- @Model.User.Id
-
- - Items
- - @Model.CipherCount
-
- - Created
- - @Model.User.CreationDate.ToString()
-
- - Modified
- - @Model.User.RevisionDate.ToString()
-
- - Account Modified
- - @Model.User.AccountRevisionDate.ToString()
-
+@Html.Partial("_ViewInformation", Model)