Extracted 'forgot my password' and 'reset password' forms into standalone objects
Merging stuff in