diff --git a/emailconfirmation.php b/emailconfirmation.php
index 1c50a09..46638e3 100644
--- a/emailconfirmation.php
+++ b/emailconfirmation.php
@@ -33,7 +33,13 @@
 	 echo happy(i18n("Thank you for validating your email address"));
 	 mysql_query("UPDATE accounts SET email=pendingemail, pendingemail=NULL, pendingemailcode=NULL WHERE id='$id'");
  } else {
-	 echo error(i18n("An error occured validating your email address"));
+	 //see if its already confirmed
+	 $q=mysql_query("SELECT * FROM accounts WHERE email='$email' AND id='$id'");
+	 if(mysql_num_rows($q)) {
+		 echo notice(i18n("Your email address has already been validated"));
+	 } else {
+		 echo error(i18n("An error occured validating your email address"));
+	 }
  }
 
  send_footer();