Merge branch 'master' into enh-external_newuser_verification

# Conflicts:
#	server/src/main/java/password/pwm/http/servlet/forgottenpw/ForgottenPasswordUtil.java

server/src/main/java/password/pwm/http/servlet/forgottenpw/ForgottenPasswordUtil.java

@@ -83,6 +83,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 
 public class ForgottenPasswordUtil
@@ -630,12 +631,17 @@ public class ForgottenPasswordUtil
     )
             throws PwmUnrecoverableException
     {
-        ProfileUtility.discoverProfileIDForUser(
+        final Optional<String> profileID = ProfileUtility.discoverProfileIDForUser(
             pwmApplication,
             sessionLabel,
             userIdentity,
             ProfileDefinition.ForgottenPassword
-        ).ifPresent( ( id ) ->  pwmApplication.getConfig().getForgottenPasswordProfiles().get( id ) );
+        );
+
+        if ( profileID.isPresent() )
+        {
+            return pwmApplication.getConfig().getForgottenPasswordProfiles().get( profileID.get() );
+        }
 
         final String msg = "user does not have a forgotten password profile assigned";
         throw PwmUnrecoverableException.newException( PwmError.ERROR_NO_PROFILE_ASSIGNED, msg );