diff --git a/pptp-client/save.cgi b/pptp-client/save.cgi
index 336756372..4d70d8b6d 100755
--- a/pptp-client/save.cgi
+++ b/pptp-client/save.cgi
@@ -28,7 +28,7 @@ if ($in{'delete'}) {
 else {
 	# Validate inputs
 	$in{'tunnel'} =~ /\S/ || &error($text{'save_ename'});
-	gethostbyname($in{'server'}) || &error($text{'save_eserver'});
+	&to_ipaddress($in{'server'}) || &error($text{'save_eserver'});
 	$in{'login_def'} || $in{'login'} =~ /^\S+$/ ||
 		&error($text{'save_elogin'});
 	$in{'remote_def'} || $in{'remote'} =~ /^\S+$/ ||
@@ -44,7 +44,7 @@ else {
 		push(@routes, "add default dev TUNNEL_DEV");
 		}
 	elsif ($in{'adddef'} == 2) {
-		gethostbyname($in{'def'}) || &error($text{'save_edef'});
+		&to_ipaddress($in{'def'}) || &error($text{'save_edef'});
 		push(@routes, "add default gw ".$in{'def'});
 		}
 
diff --git a/pptp-server/save_secret.cgi b/pptp-server/save_secret.cgi
index f1164f106..f5114c897 100755
--- a/pptp-server/save_secret.cgi
+++ b/pptp-server/save_secret.cgi
@@ -35,7 +35,7 @@ elsif ($in{'ips_mode'} == 1) { $sec{'ips'} = [ "-" ]; }
 elsif ($in{'ips_mode'} == 2) {
 	@ips = split(/\s+/, $in{'ips'});
 	foreach $ip (@ips) {
-		if (!gethostbyname($ip)) {
+		if (!&to_ipaddress($ip)) {
 			&error(&text('save_secret_enoip', $ip));
 			}
 		}