#387: Revamped forgotten password handling