diff --git a/src/Admin/Controllers/OrganizationsController.cs b/src/Admin/Controllers/OrganizationsController.cs
index c8d4a0adb7..73c1f3f891 100644
--- a/src/Admin/Controllers/OrganizationsController.cs
+++ b/src/Admin/Controllers/OrganizationsController.cs
@@ -50,7 +50,8 @@ namespace Bit.Admin.Controllers
                 UserEmail = string.IsNullOrWhiteSpace(userEmail) ? null : userEmail,
                 Paid = paid,
                 Page = page,
-                Count = count
+                Count = count,
+                Action = _globalSettings.SelfHosted ? "View" : "Edit"
             });
         }
 
diff --git a/src/Admin/Controllers/UsersController.cs b/src/Admin/Controllers/UsersController.cs
index 79e15a28e0..ef2716541e 100644
--- a/src/Admin/Controllers/UsersController.cs
+++ b/src/Admin/Controllers/UsersController.cs
@@ -47,7 +47,8 @@ namespace Bit.Admin.Controllers
                 Items = users as List<User>,
                 Email = string.IsNullOrWhiteSpace(email) ? null : email,
                 Page = page,
-                Count = count
+                Count = count,
+                Action = _globalSettings.SelfHosted ? "View" : "Edit"
             });
         }
 
diff --git a/src/Admin/Models/OrganizationsModel.cs b/src/Admin/Models/OrganizationsModel.cs
index a5d9dc2410..371d15c911 100644
--- a/src/Admin/Models/OrganizationsModel.cs
+++ b/src/Admin/Models/OrganizationsModel.cs
@@ -7,5 +7,6 @@ namespace Bit.Admin.Models
         public string Name { get; set; }
         public string UserEmail { get; set; }
         public bool? Paid { get; set; }
+        public string Action { get; set; }
     }
 }
diff --git a/src/Admin/Models/UsersModel.cs b/src/Admin/Models/UsersModel.cs
index 024a1001fa..7c0d146df4 100644
--- a/src/Admin/Models/UsersModel.cs
+++ b/src/Admin/Models/UsersModel.cs
@@ -5,5 +5,6 @@ namespace Bit.Admin.Models
     public class UsersModel : PagedModel<User>
     {
         public string Email { get; set; }
+        public string Action { get; set; }
     }
 }
diff --git a/src/Admin/Views/Organizations/Index.cshtml b/src/Admin/Views/Organizations/Index.cshtml
index e3f0001a44..35f1a4a29c 100644
--- a/src/Admin/Views/Organizations/Index.cshtml
+++ b/src/Admin/Views/Organizations/Index.cshtml
@@ -43,7 +43,7 @@
                 {
                     <tr>
                         <td>
-                            <a asp-action="Edit" asp-route-id="@org.Id">@org.Name</a>
+                            <a asp-action="@Model.Action" asp-route-id="@org.Id">@org.Name</a>
                         </td>
                         <td>
                             @org.Plan
diff --git a/src/Admin/Views/Users/Index.cshtml b/src/Admin/Views/Users/Index.cshtml
index c997770690..447b95c63f 100644
--- a/src/Admin/Views/Users/Index.cshtml
+++ b/src/Admin/Views/Users/Index.cshtml
@@ -33,7 +33,7 @@
                 {
                     <tr>
                         <td>
-                            <a asp-action="Edit" asp-route-id="@user.Id">@user.Email</a>
+                            <a asp-action="@Model.Action" asp-route-id="@user.Id">@user.Email</a>
                         </td>
                         <td>
                             <span title="@user.CreationDate.ToString()">