diff --git a/src/Admin/Controllers/OrganizationsController.cs b/src/Admin/Controllers/OrganizationsController.cs
index 73c1f3f891..ab1ea23deb 100644
--- a/src/Admin/Controllers/OrganizationsController.cs
+++ b/src/Admin/Controllers/OrganizationsController.cs
@@ -51,7 +51,8 @@ namespace Bit.Admin.Controllers
                 Paid = paid,
                 Page = page,
                 Count = count,
-                Action = _globalSettings.SelfHosted ? "View" : "Edit"
+                Action = _globalSettings.SelfHosted ? "View" : "Edit",
+                SelfHosted = _globalSettings.SelfHosted
             });
         }
 
diff --git a/src/Admin/Models/OrganizationsModel.cs b/src/Admin/Models/OrganizationsModel.cs
index 371d15c911..d8696086b5 100644
--- a/src/Admin/Models/OrganizationsModel.cs
+++ b/src/Admin/Models/OrganizationsModel.cs
@@ -8,5 +8,6 @@ namespace Bit.Admin.Models
         public string UserEmail { get; set; }
         public bool? Paid { get; set; }
         public string Action { get; set; }
+        public bool SelfHosted { get; set; }
     }
 }
diff --git a/src/Admin/Views/Organizations/Index.cshtml b/src/Admin/Views/Organizations/Index.cshtml
index 35f1a4a29c..ca2e2c37f4 100644
--- a/src/Admin/Views/Organizations/Index.cshtml
+++ b/src/Admin/Views/Organizations/Index.cshtml
@@ -57,13 +57,16 @@
                             </span>
                         </td>
                         <td>
-                            @if(!string.IsNullOrWhiteSpace(org.GatewaySubscriptionId))
+                            @if(!Model.SelfHosted)
                             {
-                                <i class="fa fa-usd fa-lg fa-fw" title="Paid"></i>
-                            }
-                            else
-                            {
-                                <i class="fa fa-smile-o fa-lg fa-fw text-muted" title="Freeloader"></i>
+                                if(!string.IsNullOrWhiteSpace(org.GatewaySubscriptionId))
+                                {
+                                    <i class="fa fa-usd fa-lg fa-fw" title="Paid"></i>
+                                }
+                                else
+                                {
+                                    <i class="fa fa-smile-o fa-lg fa-fw text-muted" title="Freeloader"></i>
+                                }
                             }
                             @if(org.MaxStorageGb.HasValue && org.MaxStorageGb > 1)
                             {
diff --git a/src/Admin/Views/Organizations/_ViewInformation.cshtml b/src/Admin/Views/Organizations/_ViewInformation.cshtml
index b716f2983a..047de6152f 100644
--- a/src/Admin/Views/Organizations/_ViewInformation.cshtml
+++ b/src/Admin/Views/Organizations/_ViewInformation.cshtml
@@ -3,8 +3,14 @@
     <dt class="col-sm-4 col-lg-3">Id</dt>
     <dd class="col-sm-8 col-lg-9"><code>@Model.Organization.Id</code></dd>
 
+    <dt class="col-sm-4 col-lg-3">Plan</dt>
+    <dd class="col-sm-8 col-lg-9">@Model.Organization.Plan</dd>
+
+    <dt class="col-sm-4 col-lg-3">Expires</dt>
+    <dd class="col-sm-8 col-lg-9">@(Model.Organization.ExpirationDate?.ToString() ?? "-")</dd>
+
     <dt class="col-sm-4 col-lg-3">Users</dt>
-    <dd class="col-sm-8 col-lg-9">@Model.UserCount</dd>
+    <dd class="col-sm-8 col-lg-9">@Model.UserCount / @(Model.Organization.Seats?.ToString() ?? "-")</dd>
 
     <dt class="col-sm-4 col-lg-3">Owners</dt>
     <dd class="col-sm-8 col-lg-9">@(string.IsNullOrWhiteSpace(Model.Owners) ? "None" : Model.Owners)</dd>
diff --git a/src/Admin/Views/Users/_ViewInformation.cshtml b/src/Admin/Views/Users/_ViewInformation.cshtml
index 6ce75d758b..59457fdc34 100644
--- a/src/Admin/Views/Users/_ViewInformation.cshtml
+++ b/src/Admin/Views/Users/_ViewInformation.cshtml
@@ -3,15 +3,21 @@
     <dt class="col-sm-4 col-lg-3">Id</dt>
     <dd class="col-sm-8 col-lg-9"><code>@Model.User.Id</code></dd>
 
+    <dt class="col-sm-4 col-lg-3">Premium</dt>
+    <dd class="col-sm-8 col-lg-9">@(Model.User.Premium ? "Yes" : "No")</dd>
+
+    <dt class="col-sm-4 col-lg-3">Premium Expires</dt>
+    <dd class="col-sm-8 col-lg-9">@(Model.User.PremiumExpirationDate?.ToString() ?? "-")</dd>
+
     <dt class="col-sm-4 col-lg-3">Items</dt>
     <dd class="col-sm-8 col-lg-9">@Model.CipherCount</dd>
 
+    <dt class="col-sm-4 col-lg-3">Vault Modified</dt>
+    <dd class="col-sm-8 col-lg-9">@Model.User.AccountRevisionDate.ToString()</dd>
+
     <dt class="col-sm-4 col-lg-3">Created</dt>
     <dd class="col-sm-8 col-lg-9">@Model.User.CreationDate.ToString()</dd>
 
     <dt class="col-sm-4 col-lg-3">Modified</dt>
     <dd class="col-sm-8 col-lg-9">@Model.User.RevisionDate.ToString()</dd>
-
-    <dt class="col-sm-4 col-lg-3">Vault Modified</dt>
-    <dd class="col-sm-8 col-lg-9">@Model.User.AccountRevisionDate.ToString()</dd>
 </dl>