diff --git a/console-webapp/src/app/settings/security/eppPasswordEdit.component.html b/console-webapp/src/app/settings/security/eppPasswordEdit.component.html
index 93908ca51d4..62b175669a9 100644
--- a/console-webapp/src/app/settings/security/eppPasswordEdit.component.html
+++ b/console-webapp/src/app/settings/security/eppPasswordEdit.component.html
@@ -21,7 +21,6 @@
Update EPP password
[formGroup]="passwordUpdateForm"
(submitResults)="save($event)"
/>
- @if(userDataService.userData()?.isAdmin) {
Need to reset your EPP password?
- }
diff --git a/console-webapp/src/app/users/userEditForm.component.html b/console-webapp/src/app/users/userEditForm.component.html
index 0b1aab4b3d3..3f4eb43db5e 100644
--- a/console-webapp/src/app/users/userEditForm.component.html
+++ b/console-webapp/src/app/users/userEditForm.component.html
@@ -44,7 +44,6 @@
Save
- @if(userDataService.userData()?.isAdmin) {
- }
diff --git a/core/src/main/java/google/registry/ui/server/console/PasswordResetRequestAction.java b/core/src/main/java/google/registry/ui/server/console/PasswordResetRequestAction.java
index 7ee27e4e4dc..63fe80de948 100644
--- a/core/src/main/java/google/registry/ui/server/console/PasswordResetRequestAction.java
+++ b/core/src/main/java/google/registry/ui/server/console/PasswordResetRequestAction.java
@@ -62,10 +62,6 @@ public PasswordResetRequestAction(
@Override
protected void postHandler(User user) {
- // Temporary flag when testing email sending etc
- if (!user.getUserRoles().isAdmin()) {
- setFailedResponse("", HttpServletResponse.SC_FORBIDDEN);
- }
tm().transact(() -> performRequest(user));
consoleApiParams.response().setStatus(HttpServletResponse.SC_OK);
}
diff --git a/core/src/main/java/google/registry/ui/server/console/PasswordResetVerifyAction.java b/core/src/main/java/google/registry/ui/server/console/PasswordResetVerifyAction.java
index 32b21c1bdbd..c492a938192 100644
--- a/core/src/main/java/google/registry/ui/server/console/PasswordResetVerifyAction.java
+++ b/core/src/main/java/google/registry/ui/server/console/PasswordResetVerifyAction.java
@@ -60,11 +60,6 @@ public PasswordResetVerifyAction(
@Override
protected void getHandler(User user) {
- // Temporary flag when testing email sending etc
- if (!user.getUserRoles().isAdmin()) {
- setFailedResponse("", HttpServletResponse.SC_FORBIDDEN);
- return;
- }
PasswordResetRequest request = tm().transact(() -> loadAndValidateResetRequest(user));
ImmutableMap result =
ImmutableMap.of("type", request.getType(), "registrarId", request.getRegistrarId());
@@ -74,11 +69,6 @@ protected void getHandler(User user) {
@Override
protected void postHandler(User user) {
- // Temporary flag when testing email sending etc
- if (!user.getUserRoles().isAdmin()) {
- setFailedResponse("", HttpServletResponse.SC_FORBIDDEN);
- return;
- }
checkArgument(!Strings.isNullOrEmpty(newPassword.orElse(null)), "Password must be provided");
tm().transact(
() -> {