diff --git a/webmin/newkey.cgi b/webmin/newkey.cgi
index 65d7b50de..8e75de0fe 100755
--- a/webmin/newkey.cgi
+++ b/webmin/newkey.cgi
@@ -7,6 +7,7 @@ require './webmin-lib.pl';
 &error_setup($text{'newkey_err'});
 
 # Validate inputs and create the key
+$in{'newfile'} || return $text{'newkey_efile'};
 $err = &parse_ssl_key_form(\%in, $in{'newfile'});
 &error($err) if ($err);
 
diff --git a/webmin/webmin-lib.pl b/webmin/webmin-lib.pl
index 0bedca54c..d4548d30b 100644
--- a/webmin/webmin-lib.pl
+++ b/webmin/webmin-lib.pl
@@ -1290,7 +1290,6 @@ local %in = %$in;
 # Validate inputs
 $in{'commonName_def'} || $in{'commonName'} =~ /^[A-Za-z0-9\.\-\*]+$/ ||
 	return $text{'newkey_ecn'};
-$in{'newfile'} || return $text{'newkey_efile'};
 $in{'size_def'} || $in{'size'} =~ /^\d+$/ || return $text{'newkey_esize'};
 $in{'days'} =~ /^\d+$/ || return $text{'newkey_edays'};
 $in{'countryName'} =~ /^\S\S$/ || return $text{'newkey_ecountry'};