[#548] Fix broken password reset and add FIXMEs
Merge branch '548-password-reset-fix'