diff --git a/app/code/Magento/Checkout/etc/adminhtml/system.xml b/app/code/Magento/Checkout/etc/adminhtml/system.xml
index 11e3ba5f3ed9a..2afa796443e75 100644
--- a/app/code/Magento/Checkout/etc/adminhtml/system.xml
+++ b/app/code/Magento/Checkout/etc/adminhtml/system.xml
@@ -27,12 +27,14 @@
+ validate-zero-or-greater validate-digits
+ validate-zero-or-greater validate-digits
@@ -40,6 +42,7 @@
@@ -61,9 +64,11 @@
+ validate-zero-or-greater validate-digits
+ validate-zero-or-greater validate-digits
@@ -83,6 +88,7 @@
+ validate-emails
Separate by ",".
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index d5287659ee7d2..04d5fae435816 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -117,13 +117,15 @@
1
-
+
+ Please enter at least 0 and at most 65535
paypal/wpp/proxy_port
1
1
+ validate-digits validate-digits-range digits-range-0-65535
@@ -348,6 +350,7 @@
Order
+ validate-zero-or-greater validate-digits
@@ -357,6 +360,7 @@
Order
+ validate-zero-or-greater validate-digits
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
index cba36916c3305..1ae0b52146c38 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
@@ -69,13 +69,15 @@
1
-
+
+ Please enter at least 0 and at most 65535
payment/payflow_advanced/proxy_port
1
1
+ validate-digits validate-digits-range digits-range-0-65535
Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink\Advanced
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
index ed11e8ba18d07..ead70eca3fadd 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
@@ -70,13 +70,15 @@
1
-
+
+ Please enter at least 0 and at most 65535
payment/payflow_link/proxy_port
1
1
+ validate-digits validate-digits-range digits-range-0-65535
Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink\Info
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
index e5a0319bdc1bf..c87a781f36c00 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
@@ -65,13 +65,15 @@
1
-
+
+ Please enter at least 0 and at most 65535
payment/payflowpro/proxy_port
1
1
+ validate-digits validate-digits-range digits-range-0-65535
diff --git a/app/code/Magento/Paypal/i18n/en_US.csv b/app/code/Magento/Paypal/i18n/en_US.csv
index e7264a6de807f..4e47c4c1f9e9f 100644
--- a/app/code/Magento/Paypal/i18n/en_US.csv
+++ b/app/code/Magento/Paypal/i18n/en_US.csv
@@ -737,3 +737,4 @@ User,User
"PayPal Credit","PayPal Credit"
"PayPal Guest Checkout Credit Card Icons","PayPal Guest Checkout Credit Card Icons"
"Elektronisches Lastschriftverfahren - German ELV","Elektronisches Lastschriftverfahren - German ELV"
+"Please enter at least 0 and at most 65535","Please enter at least 0 and at most 65535"