fix issue #573

Author: jrivard

server/src/main/java/password/pwm/http/servlet/activation/ActivateUserServlet.java

@@ -338,10 +338,12 @@ public ProcessStatus handleEnterCode(
                     TokenService.TokenEntryType.unauthenticated
             );
 
-            activateUserBean.setUserIdentity( tokenPayload.getUserIdentity() );
+            if ( activateUserBean.getUserIdentity() == null )
+            {
+                ActivateUserUtils.initUserActivationBean( pwmRequest, tokenPayload.getUserIdentity() );
+            }
+
             activateUserBean.setTokenPassed( true );
-            activateUserBean.setFormValidated( true );
-            activateUserBean.setTokenDestination( tokenPayload.getDestination() );
             activateUserBean.setTokenSent( true );
 
             if ( pwmRequest.getConfig().readSettingAsBoolean( PwmSetting.DISPLAY_TOKEN_SUCCESS_BUTTON ) )
@@ -413,7 +415,7 @@ protected void nextStep( final PwmRequest pwmRequest ) throws PwmUnrecoverableEx
         final ActivateUserProfile activateUserProfile = activateUserProfile( pwmRequest );
 
         final MessageSendMethod tokenSendMethod = activateUserProfile.readSettingAsEnum( PwmSetting.ACTIVATE_TOKEN_SEND_METHOD, MessageSendMethod.class );
-        if ( tokenSendMethod != MessageSendMethod.NONE && tokenSendMethod != null )
+        if ( !activateUserBean.isTokenPassed() && tokenSendMethod != MessageSendMethod.NONE && tokenSendMethod != null )
         {
             final List<TokenDestinationItem> tokenDestinationItems = TokenUtil.figureAvailableTokenDestinations(
                     pwmApplication,
@@ -459,14 +461,16 @@ protected void nextStep( final PwmRequest pwmRequest ) throws PwmUnrecoverableEx
             }
         }
 
-        final String agreementText = activateUserProfile.readSettingAsLocalizedString(
-                PwmSetting.ACTIVATE_AGREEMENT_MESSAGE,
-                pwmSession.getSessionStateBean().getLocale()
-        );
-        if ( !StringUtil.isEmpty( agreementText ) && !activateUserBean.isAgreementPassed() )
         {
-            ActivateUserUtils.forwardToAgreementPage( pwmRequest );
-            return;
+            final String agreementText = activateUserProfile.readSettingAsLocalizedString(
+                    PwmSetting.ACTIVATE_AGREEMENT_MESSAGE,
+                    pwmSession.getSessionStateBean().getLocale()
+            );
+            if ( !StringUtil.isEmpty( agreementText ) && !activateUserBean.isAgreementPassed() )
+            {
+                ActivateUserUtils.forwardToAgreementPage( pwmRequest );
+                return;
+            }
         }
 
         try