diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BirthFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BirthFormType.java
index 54208f1e7..d5b9bc654 100644
--- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BirthFormType.java
+++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BirthFormType.java
@@ -21,7 +21,11 @@
 import org.labkey.api.ehr.dataentry.TaskForm;
 import org.labkey.api.ehr.dataentry.TaskFormSection;
 import org.labkey.api.module.Module;
+import org.labkey.api.security.Group;
+import org.labkey.api.security.GroupManager;
+import org.labkey.api.security.permissions.AdminPermission;
 import org.labkey.api.view.template.ClientDependency;
+import org.labkey.security.xml.GroupEnumType;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -106,5 +110,17 @@ protected List<String> getButtonConfigs()
 
         return defaultButtons;
     }
+    //Added: 6-3-26 R.Blasa
+    @Override
+    public boolean isVisible()
+    {
+        Group g = GroupManager.getGroup(getCtx().getContainer(), "Arrival-Departure SF", GroupEnumType.SITE);
+        if (g != null && getCtx().getUser().isInGroup(g.getUserId()) && !getCtx().getContainer().hasPermission(getCtx().getUser(), AdminPermission.class))
+        {
+            return false;
+        }
+        return super.isVisible();
+    }
+
 
 }
diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/FlagsFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/FlagsFormType.java
index 362f42144..007fabfd4 100644
--- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/FlagsFormType.java
+++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/FlagsFormType.java
@@ -89,7 +89,7 @@ protected boolean canInsert()
         return canInsert;
     }
 
-    //Added: 8-7-2024 R.Blasa
+    //Added: 6-3-26 R.Blasa
     @Override
     public boolean isVisible()
     {
@@ -98,6 +98,12 @@ public boolean isVisible()
         {
             return false;
         }
+        Group h = GroupManager.getGroup(getCtx().getContainer(), "Arrival-Departure SF", GroupEnumType.SITE);
+        if (h != null && getCtx().getUser().isInGroup(h.getUserId()) && !getCtx().getContainer().hasPermission(getCtx().getUser(), AdminPermission.class))
+        {
+            return false;
+        }
         return super.isVisible();
     }
+
 }