diff --git a/www/verify.php b/www/verify.php
index 2fee994..88c53e5 100644
--- a/www/verify.php
+++ b/www/verify.php
@@ -1,5 +1,5 @@
 <? /*
-    Copyright (C) 2004 by Duane Groth <duane_at_CAcert_dot_org>
+    Copyright (C) 2004-2006 by Duane Groth <duane_at_CAcert_dot_org>
 
     This file is part of CAcert.
 
@@ -46,7 +46,7 @@
 			mysql_query("update `email` set `attempts`='$row[attempts]' where `id`='$emailid'");
 		}
 
-		$query = "select * from `email` where `id`='$emailid' and `hash`='$hash' and hash!='' and deleted=0 and `attempts` <= 6";
+		$query = "select * from `email` where `id`='$emailid' and `hash`='$hash' and hash!='' and deleted=0";
 		$res = mysql_query($query);
 		if(mysql_num_rows($res) <= 0)
 		{
@@ -94,7 +94,7 @@
 		{
 			$row = mysql_fetch_assoc($res);
 			$row[attempts]++;
-			if($row[attempts] == 4)
+			if($row[attempts] >= 6)
 			{
 				$query = "update `domains` set `hash`='', `attempts`='$row[attempts]', `deleted`=NOW() where `id`='$domainid'";
 				showheader(_("Error!"), _("Error!"));
@@ -132,9 +132,9 @@
 			echo "<input type='hidden' name='domainid' value='$domainid'>";
 			echo "<input type='hidden' name='hash' value='$hash'>";
 			echo "<input type='hidden' name='type' value='domain'>";
-			echo "<input type='submit' name='Yes' value='"._("Yes verify this email")."'><br>\n";
+			echo "<input type='submit' name='Yes' value='"._("Yes verify this domain")."'><br>\n";
 			echo "<input type='submit' name='Notify' value='"._("Notify support about this")."'><br>\n";
-			echo "<input type='submit' name='No' value='"._("Do not verify this email")."'></form>\n";
+			echo "<input type='submit' name='No' value='"._("Do not verify this domain")."'></form>\n";
 		}
 		showfooter();
 		exit;