Index: openacs-4/packages/acs-subsite/lib/email-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/email-confirm.adp,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/acs-subsite/lib/email-confirm.adp	7 Aug 2017 23:47:57 -0000	1.4
+++ openacs-4/packages/acs-subsite/lib/email-confirm.adp	19 Mar 2019 12:43:01 -0000	1.4.2.1
@@ -1,32 +1,18 @@
 
-<if @user_info.email_verified_p;literal@ true>
+<property name="doc(title)">#acs-subsite.lt_Your_email_is_confirm#</property>
 
-  <property name="doc(title)">#acs-subsite.lt_Your_email_is_confirm#</property>
+<if @user_info.member_state@ eq "approved">
 
-  <if @user_info.member_state@ eq "approved">
-
-    #acs-subsite.lt_Your_email_has_been_c#
-    <p>
+  #acs-subsite.lt_Your_email_has_been_c#
+  <p>
     <form action="index" method=post>
-    @export_vars;noquote@
-    <input type="submit" value="#acs-kernel.common_continue#">
+      @export_vars;noquote@
+      <input type="submit" value="#acs-kernel.common_continue#">
     </form>
 
-  </if>
-  <else>
-
-    <p> #acs-subsite.lt_Your_email_has_been_c_1# </p>
-
-  </else>
-
 </if>
 <else>
 
-  <property name="doc(title)">#acs-subsite.Email_not_Requested#</property>
+  <p> #acs-subsite.lt_Your_email_has_been_c_1# </p>
 
-  <p> #acs-subsite.lt_We_were_not_awaiting_# </p>
-
-  <p> #acs-subsite.lt_Please_try_to_a_hrefi# </p>
-    
 </else>
-
Index: openacs-4/packages/acs-subsite/lib/email-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/email-confirm.tcl,v
diff -u -r1.2.2.2 -r1.2.2.3
--- openacs-4/packages/acs-subsite/lib/email-confirm.tcl	14 Mar 2019 16:10:17 -0000	1.2.2.2
+++ openacs-4/packages/acs-subsite/lib/email-confirm.tcl	19 Mar 2019 12:43:01 -0000	1.2.2.3
@@ -12,6 +12,7 @@
     set title "Bad token"
     set message "The link given to authenticate your email was invalid."
     ad_return_template /packages/acs-subsite/lib/message
+    ad_script_abort
 } else {
     auth::set_email_verified -user_id $user_id