diff --git a/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.html b/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.html
index 9e272fdcbfb..c45d209c5c7 100644
--- a/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.html
+++ b/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.html
@@ -658,8 +658,25 @@ <h3 class="modal-title">{{ headerTitle | translate }}</h3>
                             for="ruleDeletion"
                             >{{
                                 'REPLICATION.DELETE_REMOTE_IMAGES' | translate
-                            }}</label
-                        >
+                            }}
+                            <clr-tooltip>
+                                <clr-icon
+                                    clrTooltipTrigger
+                                    shape="info-circle"
+                                    size="24"></clr-icon>
+                                <clr-tooltip-content
+                                    clrPosition="top-left"
+                                    clrSize="lg"
+                                    *clrIfOpen>
+                                    <span>
+                                        {{
+                                            'REPLICATION.PUSH_BASED_ONLY'
+                                                | translate
+                                        }}
+                                    </span>
+                                </clr-tooltip-content>
+                            </clr-tooltip>
+                        </label>
                     </div>
                 </div>
             </div>
diff --git a/src/portal/src/app/oidc-onboard/oidc-onboard.component.html b/src/portal/src/app/oidc-onboard/oidc-onboard.component.html
index d56ccee31f1..8dce110ec87 100644
--- a/src/portal/src/app/oidc-onboard/oidc-onboard.component.html
+++ b/src/portal/src/app/oidc-onboard/oidc-onboard.component.html
@@ -55,6 +55,7 @@ <h3 class="modal-title oidc-header-text">
                                 name="oidcUsername"
                                 type="text"
                                 [formControl]="oidcUsername"
+                                pattern='[^,"~#$%]+'
                                 required
                                 id="oidcUsername"
                                 size="40" />
diff --git a/src/portal/src/i18n/lang/de-de-lang.json b/src/portal/src/i18n/lang/de-de-lang.json
index 80b0cadfc63..a925d04ad22 100644
--- a/src/portal/src/i18n/lang/de-de-lang.json
+++ b/src/portal/src/i18n/lang/de-de-lang.json
@@ -492,6 +492,7 @@
         "RESOURCE_TYPE": "Ressourcen-Typ"
     },
     "REPLICATION": {
+        "PUSH_BASED_ONLY": "Only for the push-based replication",
         "YES": "Ja",
         "SECONDS": "Sekunden",
         "MINUTES": "Minuten",
diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json
index c606ca34986..f3b0424fb1c 100644
--- a/src/portal/src/i18n/lang/en-us-lang.json
+++ b/src/portal/src/i18n/lang/en-us-lang.json
@@ -493,6 +493,7 @@
         "RESOURCE_TYPE": "Resource Type"
     },
     "REPLICATION": {
+        "PUSH_BASED_ONLY": "Only for the push-based replication",
         "YES": "Yes",
         "SECONDS": "Seconds",
         "MINUTES": "Minutes",
diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json
index af7cb467e3d..999cab9d8a6 100644
--- a/src/portal/src/i18n/lang/es-es-lang.json
+++ b/src/portal/src/i18n/lang/es-es-lang.json
@@ -492,6 +492,7 @@
         "RESOURCE_TYPE": "Resource Type"
     },
     "REPLICATION": {
+        "PUSH_BASED_ONLY": "Only for the push-based replication",
         "YES": "Yes",
         "SECONDS": "Seconds",
         "MINUTES": "Minutes",
diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json
index ac2bfb964cd..948ca843cf0 100644
--- a/src/portal/src/i18n/lang/fr-fr-lang.json
+++ b/src/portal/src/i18n/lang/fr-fr-lang.json
@@ -484,6 +484,7 @@
         "RESOURCE_TYPE": "Type de ressource"
     },
     "REPLICATION": {
+        "PUSH_BASED_ONLY": "Only for the push-based replication",
         "YES": "Oui",
         "SECONDS": "Secondes",
         "MINUTES": "Minutes",
diff --git a/src/portal/src/i18n/lang/pt-br-lang.json b/src/portal/src/i18n/lang/pt-br-lang.json
index e2b5733fb7a..6690f50b262 100644
--- a/src/portal/src/i18n/lang/pt-br-lang.json
+++ b/src/portal/src/i18n/lang/pt-br-lang.json
@@ -490,6 +490,7 @@
         "RESOURCE_TYPE": "Tipo de Recurso"
     },
     "REPLICATION": {
+        "PUSH_BASED_ONLY": "Only for the push-based replication",
         "YES": "Sim",
         "SECONDS": "Segundo",
         "MINUTES": "Minuto",
diff --git a/src/portal/src/i18n/lang/tr-tr-lang.json b/src/portal/src/i18n/lang/tr-tr-lang.json
index 9b0941edc0a..204de7e5f54 100644
--- a/src/portal/src/i18n/lang/tr-tr-lang.json
+++ b/src/portal/src/i18n/lang/tr-tr-lang.json
@@ -492,6 +492,7 @@
         "RESOURCE_TYPE": "Resource Type"
     },
     "REPLICATION": {
+        "PUSH_BASED_ONLY": "Only for the push-based replication",
         "YES": "Evet",
         "SECONDS": "Saniye",
         "MINUTES": "Dakika",
diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json
index a3e91b9e8d8..6485f938211 100644
--- a/src/portal/src/i18n/lang/zh-cn-lang.json
+++ b/src/portal/src/i18n/lang/zh-cn-lang.json
@@ -491,6 +491,7 @@
         "RESOURCE_TYPE": "资源类型"
     },
     "REPLICATION": {
+        "PUSH_BASED_ONLY": "仅针对于 Push-Based 模式下的复制操作",
         "YES": "是",
         "SECONDS": "秒",
         "MINUTES": "分钟",
diff --git a/src/portal/src/i18n/lang/zh-tw-lang.json b/src/portal/src/i18n/lang/zh-tw-lang.json
index ce5a08298ad..455f308dad9 100644
--- a/src/portal/src/i18n/lang/zh-tw-lang.json
+++ b/src/portal/src/i18n/lang/zh-tw-lang.json
@@ -491,6 +491,7 @@
     "RESOURCE_TYPE": "資源類型"
   },
   "REPLICATION": {
+    "PUSH_BASED_ONLY": "Only for the push-based replication",
     "YES": "是",
     "SECONDS": "秒",
     "MINUTES": "分鐘",