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.18.4.2 -r1.18.4.3
--- openacs-4/packages/acs-subsite/lib/user-new.tcl	6 Oct 2013 12:12:47 -0000	1.18.4.2
+++ openacs-4/packages/acs-subsite/lib/user-new.tcl	16 Apr 2014 18:16:14 -0000	1.18.4.3
@@ -136,13 +136,23 @@
             # Continue below
         }
         default {
+
+	    if {[parameter::get -parameter RegistrationRequiresEmailVerificationP -default 0] &&
+		$creation_info(account_status) eq "closed"} {
+		ad_return_warning "Email Validation is required" $creation_info(account_message)
+		ad_script_abort
+	    }
+	    if {[parameter::get -parameter RegistrationRequiresApprovalP -default 0] &&
+		$creation_info(account_status) eq "closed"} {
+		ad_return_warning "Account approval is required" $creation_info(account_message)
+		ad_script_abort
+	    }
+
             # Display the message on a separate page
             ad_returnredirect \
                 -message $creation_info(account_message) \
                 -html \
-                [export_vars \
-                     -base "[subsite::get_element \
-                                -element url]register/account-closed"]
+		"[subsite::get_element -element url]register/account-closed"
             ad_script_abort
         }
     }