diff --git a/src/Admin/AdminConsole/Views/Shared/_OrganizationForm.cshtml b/src/Admin/AdminConsole/Views/Shared/_OrganizationForm.cshtml
index 267264a38fd9..a5b930272765 100644
--- a/src/Admin/AdminConsole/Views/Shared/_OrganizationForm.cshtml
+++ b/src/Admin/AdminConsole/Views/Shared/_OrganizationForm.cshtml
@@ -152,13 +152,10 @@
- @if(FeatureService.IsEnabled(FeatureFlagKeys.PM17772_AdminInitiatedSponsorships))
- {
-
-
-
-
- }
+
+
+
+
Password Manager
diff --git a/src/Api/Billing/Controllers/OrganizationSponsorshipsController.cs b/src/Api/Billing/Controllers/OrganizationSponsorshipsController.cs
index 8c202752debd..7ca85d52a831 100644
--- a/src/Api/Billing/Controllers/OrganizationSponsorshipsController.cs
+++ b/src/Api/Billing/Controllers/OrganizationSponsorshipsController.cs
@@ -89,19 +89,6 @@ public async Task CreateSponsorship(Guid sponsoringOrgId, [FromBody] Organizatio
throw new BadRequestException("Free Bitwarden Families sponsorship has been disabled by your organization administrator.");
}
- if (!_featureService.IsEnabled(Bit.Core.FeatureFlagKeys.PM17772_AdminInitiatedSponsorships))
- {
- if (model.IsAdminInitiated.GetValueOrDefault())
- {
- throw new BadRequestException();
- }
-
- if (!string.IsNullOrWhiteSpace(model.Notes))
- {
- model.Notes = null;
- }
- }
-
var sponsorship = await _createSponsorshipCommand.CreateSponsorshipAsync(
sponsoringOrg,
await _organizationUserRepository.GetByOrganizationAsync(sponsoringOrgId, _currentContext.UserId ?? default),
diff --git a/src/Api/Controllers/SelfHosted/SelfHostedOrganizationSponsorshipsController.cs b/src/Api/Controllers/SelfHosted/SelfHostedOrganizationSponsorshipsController.cs
index 198438201c0e..6865bc06dadd 100644
--- a/src/Api/Controllers/SelfHosted/SelfHostedOrganizationSponsorshipsController.cs
+++ b/src/Api/Controllers/SelfHosted/SelfHostedOrganizationSponsorshipsController.cs
@@ -55,19 +55,6 @@ IAuthorizationService authorizationService
[HttpPost("{sponsoringOrgId}/families-for-enterprise")]
public async Task CreateSponsorship(Guid sponsoringOrgId, [FromBody] OrganizationSponsorshipCreateRequestModel model)
{
- if (!_featureService.IsEnabled(Bit.Core.FeatureFlagKeys.PM17772_AdminInitiatedSponsorships))
- {
- if (model.IsAdminInitiated.GetValueOrDefault())
- {
- throw new BadRequestException();
- }
-
- if (!string.IsNullOrWhiteSpace(model.Notes))
- {
- model.Notes = null;
- }
- }
-
await _offerSponsorshipCommand.CreateSponsorshipAsync(
await _organizationRepository.GetByIdAsync(sponsoringOrgId),
await _organizationUserRepository.GetByOrganizationAsync(sponsoringOrgId, _currentContext.UserId ?? default),
diff --git a/src/Core/Constants.cs b/src/Core/Constants.cs
index d0d63ff787c5..6bb773bb9ead 100644
--- a/src/Core/Constants.cs
+++ b/src/Core/Constants.cs
@@ -173,7 +173,6 @@ public static class FeatureFlagKeys
/* Billing Team */
public const string TrialPayment = "PM-8163-trial-payment";
- public const string PM17772_AdminInitiatedSponsorships = "pm-17772-admin-initiated-sponsorships";
public const string UsePricingService = "use-pricing-service";
public const string PM19422_AllowAutomaticTaxUpdates = "pm-19422-allow-automatic-tax-updates";
public const string PM21821_ProviderPortalTakeover = "pm-21821-provider-portal-takeover";