diff --git a/Config/FluentCommon.cs b/Config/FluentCommon.cs
index cf82d2799..71f8aa72d 100644
--- a/Config/FluentCommon.cs
+++ b/Config/FluentCommon.cs
@@ -128,7 +128,7 @@ namespace Config
                             case GID.Administrators:
 #if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
                             case GID.TraceabilityManagement:
-#elif KEMPNO_50 || KRAKOW_50 || TORUN_50 || WARSAW_50 || WARSAW_END
+#elif LANG_PL
                             case GID.MetrologicalAuthority:
                             case GID.WaterMeterAuthority:
 #endif
diff --git a/TBF/UI/Bench/Metrology/MetrologyDlg.cs b/TBF/UI/Bench/Metrology/MetrologyDlg.cs
index fe1ffb022..db0cd210a 100644
--- a/TBF/UI/Bench/Metrology/MetrologyDlg.cs
+++ b/TBF/UI/Bench/Metrology/MetrologyDlg.cs
@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -28,7 +28,9 @@ namespace TBF.UI.Bench.Metrology
 
             /// SharedDlgButtons configuration
             sharedButtons.ParentForm = this;
-            sharedButtons.RequiredGroupMembership = new Common.GID[] { Common.GID.Metrologists, Common.GID.MetrologicalAuthority };
+            sharedButtons.RequiredGroupMembership = new GID[] { GID.Metrologists,
+                                                                GID.MetrologicalAuthority,
+                                                                GID.WaterMeterAuthority };
 			sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | SharedButtons.Buttons.Remove;
             sharedButtons.Unlocked += unlockButton_Click;
             sharedButtons.OKClicked += okButton_Click;
diff --git a/TBF/UI/Bench/Uncertainties/UncertaintiesDlg.cs b/TBF/UI/Bench/Uncertainties/UncertaintiesDlg.cs
index 5a10877d3..608abd3ed 100644
--- a/TBF/UI/Bench/Uncertainties/UncertaintiesDlg.cs
+++ b/TBF/UI/Bench/Uncertainties/UncertaintiesDlg.cs
@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
+/// Copyright (c) 2019-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -28,10 +28,10 @@ namespace TBF.UI.Bench.Uncertainties
 
             /// SharedDlgButtons configuration
             sharedButtons.ParentForm = this;
-#if KEMPNO_50
-            sharedButtons.RequiredGroupMembership = new Common.GID[] { Common.GID.MetrologicalAuthority };
+#if LANG_PL
+            sharedButtons.RequiredGroupMembership = new GID[] { GID.MetrologicalAuthority };
 #else
-			sharedButtons.RequiredGroupMembership = new Common.GID[] { Common.GID.Metrologists };
+            sharedButtons.RequiredGroupMembership = new GID[] { GID.Metrologists, GID.MetrologicalAuthority };
 #endif
 			sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | SharedButtons.Buttons.Remove;
             sharedButtons.Unlocked += unlockButton_Click;
diff --git a/TBF/UI/Procedures/ProcedureDlg.cs b/TBF/UI/Procedures/ProcedureDlg.cs
index 98f7ebd8d..7f4013140 100644
--- a/TBF/UI/Procedures/ProcedureDlg.cs
+++ b/TBF/UI/Procedures/ProcedureDlg.cs
@@ -1,7 +1,7 @@
 ///
 /// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
-#if KEMPNO_50 || KRAKOW_50 || TORUN_50 || WARSAW_50 || WARSAW_END
+#if LANG_PL
 #define SHOW_Q_TG
 #endif
 
@@ -88,9 +88,9 @@ namespace TBF.UI.Procedures
 
             /// SharedDlgButtons configuration
             sharedButtons.ParentForm = parentForm;
-#if KEMPNO_50 || KRAKOW_50 || TORUN_50 || WARSAW_50 || WARSAW_END
+#if LANG_PL
             sharedButtons.RequiredGroupMembership = procedure.Protected ? new GID[] { GID.WaterMeterAuthority }
-                                                                        : new GID[] { GID.TestingSpecialists, GID.WaterMeterAuthority };
+                                                                        : new GID[] { GID.TestingSpecialists, GID.Metrologists, GID.WaterMeterAuthority };
 #else
             sharedButtons.RequiredGroupMembership = procedure.Protected ? new GID[] { GID.Metrologists }
                                                                         : new GID[] { GID.TestingSpecialists, GID.Metrologists };
@@ -359,7 +359,7 @@ namespace TBF.UI.Procedures
             LoadUISettings();
 
             /// Enable/disable/show/hide controls in General tab
-#if KEMPNO_50 || KRAKOW_50 || TORUN_50 || WARSAW_50 || WARSAW_END
+#if LANG_PL
             altProcNameLabel.Visible = true;
             altProcNameTextBox.Visible = true;
             //altProcPeriodLabel.Visible = true;