FS-4: Finishing touches for the PBKDF2 user story.