diff --git a/htdocs/don.class.php b/htdocs/don.class.php
index 11476872cdd..84bf172d671 100644
--- a/htdocs/don.class.php
+++ b/htdocs/don.class.php
@@ -117,23 +117,32 @@ class Don
 	    {
 	      $error_string[$err] = "Le montant du don contient un/des caractère(s) invalide(s)";
 	      $err++;
+	      $amount_invalid = 1;
 	      break;
 	    } 	      
 	}
 
-      if ($this->amount == 0)
+      if (! $amount_invalid)
 	{
-	  $error_string[$err] = "Le montant du don est null";
-	  $err++;
-	}
-      else
-	{
-	  if ($this->amount < $minimum && $minimum > 0)
+	  if ($this->amount == 0)
 	    {
-	      $error_string[$err] = "Le montant minimum du don est de $minimum";
+	      $error_string[$err] = "Le montant du don est null";
 	      $err++;
 	    }
+	  else
+	    {
+	      if ($this->amount < $minimum && $minimum > 0)
+		{
+		  $error_string[$err] = "Le montant minimum du don est de $minimum";
+		  $err++;
+		}
+	    }
 	}
+      
+      /*
+       * Return errors
+       *
+       */
 
       if ($err)
 	{
diff --git a/htdocs/public/dons/index.php b/htdocs/public/dons/index.php
index 522b6f3b084..cd4f61121bc 100644
--- a/htdocs/public/dons/index.php
+++ b/htdocs/public/dons/index.php
@@ -50,7 +50,7 @@ if ($conf->don->enabled)
   if ($HTTP_POST_VARS["action"] == 'add')
     {
       
-      if ($don->check())
+      if ($don->check($conf->don->minimum))
 	{
 	  require("valid.php");
 	}
@@ -62,7 +62,7 @@ if ($conf->don->enabled)
   elseif ($HTTP_POST_VARS["action"] == 'valid')
     {
       
-      if ($don->check())
+      if ($don->check($conf->don->minimum))
 	{
 	  $return = $don->create(0);