Index: openacs-4/packages/acs-subsite/acs-subsite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v
diff -u -r1.83 -r1.84
--- openacs-4/packages/acs-subsite/acs-subsite.info	6 Oct 2006 13:21:51 -0000	1.83
+++ openacs-4/packages/acs-subsite/acs-subsite.info	11 Dec 2006 17:49:14 -0000	1.84
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="5.3.0d2" url="http://openacs.org/repository/download/apm/acs-subsite-5.3.0d2.apm">
+    <version name="5.4.0d1" url="http://openacs.org/repository/download/apm/acs-subsite-5.4.0d1.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Subsite</summary>
         <release-date>2006-06-04</release-date>
@@ -16,7 +16,7 @@
         <license>GPL</license>
         <maturity>3</maturity>
 
-        <provides url="acs-subsite" version="5.3.0d2"/>
+        <provides url="acs-subsite" version="5.4.0d1"/>
         <requires url="acs-authentication" version="5.3.0d1"/>
         <requires url="acs-content-repository" version="5.3.0d1"/>
         <requires url="acs-kernel" version="5.3.0d1"/>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml,v
diff -u -r1.73 -r1.74
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	19 Oct 2006 12:54:57 -0000	1.73
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	11 Dec 2006 17:49:14 -0000	1.74
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-subsite" package_version="5.3.0d1" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="acs-subsite" package_version="5.3.0d2" locale="en_US" charset="ISO-8859-1">
 
   <msg key="_or">, or</msg>
   <msg key="_Update_Basic_Information">Update Basic Information</msg>
@@ -118,6 +118,7 @@
   <msg key="Edit_Options">Edit Options</msg>
   <msg key="Elements_not_editable">Certain elements are not editable, because they are managed by %authority_name%.</msg>
   <msg key="Email">Email</msg>
+  <msg key="Email_already_exists">#acs-subsite.Email# already exists</msg>
   <msg key="email_as_a_form">Allow contact me with a form</msg>
   <msg key="email_as_a_form_admin">Allow contact with a form</msg>
   <msg key="email_as_image">Show my E-mail as an image</msg>
Index: openacs-4/packages/acs-subsite/lib/user-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/user-new.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-subsite/lib/user-new.tcl	4 Jun 2006 00:45:41 -0000	1.14
+++ openacs-4/packages/acs-subsite/lib/user-new.tcl	11 Dec 2006 17:49:13 -0000	1.15
@@ -54,7 +54,12 @@
 # Pre-generate user_id for double-click protection
 set user_id [db_nextval acs_object_id_seq]
 
-ad_form -name register -export {next_url user_id return_url} -form [auth::get_registration_form_elements]
+ad_form -name register -export {next_url user_id return_url} -form [auth::get_registration_form_elements]  -validate {
+    {email
+        {[string eq "" [party::get_by_email -email $email]]}
+        "[_ acs-subsite.Email_already_exists]"
+    }
+}
 
 if { [exists_and_not_null rel_group_id] } {
     ad_form -extend -name register -form {