diff --git a/scripts/pi-hole/js/groups-clients.js b/scripts/pi-hole/js/groups-clients.js
index 18762c67..6df7435a 100644
--- a/scripts/pi-hole/js/groups-clients.js
+++ b/scripts/pi-hole/js/groups-clients.js
@@ -251,7 +251,7 @@ function addClient() {
   var ip = $("#select").val();
   var comment = $("#new_comment").val();
   if (ip === "custom") {
-    ip = $("#ip-custom").val();
+    ip = $("#ip-custom").val().trim();
   }
 
   utils.disableAll();
diff --git a/scripts/pi-hole/php/func.php b/scripts/pi-hole/php/func.php
index ebd100c0..37eb8e9d 100644
--- a/scripts/pi-hole/php/func.php
+++ b/scripts/pi-hole/php/func.php
@@ -137,10 +137,10 @@ function addCustomDNSEntry($ip="", $domain="", $json_reply=true)
     try
     {
         if(isset($_REQUEST['ip']))
-            $ip = $_REQUEST['ip'];
+            $ip = trim($_REQUEST['ip']);
 
         if(isset($_REQUEST['domain']))
-            $domain = $_REQUEST['domain'];
+            $domain = trim($_REQUEST['domain']);
 
         if (empty($ip))
             return error("IP must be set");
diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
index d329eea1..d537ae8b 100644
--- a/scripts/pi-hole/php/savesettings.php
+++ b/scripts/pi-hole/php/savesettings.php
@@ -262,10 +262,10 @@ function addStaticDHCPLease($mac, $ip, $hostname) {
 					if(array_key_exists("custom".$i,$_POST))
 					{
 						$exploded = explode("#", $_POST["custom".$i."val"], 2);
-						$IP = $exploded[0];
+						$IP = trim($exploded[0]);
 						if(count($exploded) > 1)
 						{
-							$port = $exploded[1];
+							$port = trim($exploded[1]);
 						}
 						else
 						{
@@ -326,22 +326,25 @@ function addStaticDHCPLease($mac, $ip, $hostname) {
 				// Check if Conditional Forwarding is requested
 				if(isset($_POST["conditionalForwarding"]))
 				{
+					$conditionalForwardingIP = trim($_POST["conditionalForwardingIP"]);
+					$conditionalForwardingDomain = trim($_POST["conditionalForwardingDomain"]);
+
 					// Validate conditional forwarding IP
-					if (!validIP($_POST["conditionalForwardingIP"]))
+					if (!validIP($conditionalForwardingIP))
 					{
-						$error .= "Conditional forwarding IP (".htmlspecialchars($_POST["conditionalForwardingIP"]).") is invalid!<br>";
+						$error .= "Conditional forwarding IP (".htmlspecialchars($conditionalForwardingIP).") is invalid!<br>";
 					}
 
 					// Validate conditional forwarding domain name
-					if(!validDomain($_POST["conditionalForwardingDomain"]))
+					if(!validDomain($conditionalForwardingDomain))
 					{
-						$error .= "Conditional forwarding domain name (".htmlspecialchars($_POST["conditionalForwardingDomain"]).") is invalid!<br>";
+						$error .= "Conditional forwarding domain name (".htmlspecialchars($conditionalForwardingDomain).") is invalid!<br>";
 					}
 					if(!$error)
 					{
-						$addressArray = explode(".", $_POST["conditionalForwardingIP"]);
+						$addressArray = explode(".", $conditionalForwardingIP);
 						$reverseAddress = $addressArray[2].".".$addressArray[1].".".$addressArray[0].".in-addr.arpa";
-						$extra .= " conditional_forwarding ".$_POST["conditionalForwardingIP"]." ".$_POST["conditionalForwardingDomain"]." $reverseAddress";
+						$extra .= " conditional_forwarding ".$conditionalForwardingIP." ".$conditionalForwardingDomain." $reverseAddress";
 					}
 				}
 
@@ -588,9 +591,9 @@ function addStaticDHCPLease($mac, $ip, $hostname) {
 
 				if(isset($_POST["addstatic"]))
 				{
-					$mac = $_POST["AddMAC"];
-					$ip = $_POST["AddIP"];
-					$hostname = $_POST["AddHostname"];
+					$mac = trim($_POST["AddMAC"]);
+					$ip = trim($_POST["AddIP"]);
+					$hostname = trim($_POST["AddHostname"]);
 
 					addStaticDHCPLease($mac, $ip, $hostname);
 					break;