Fix #37
Merge pull request #40 from dhoko/passwordHook_#37

Fix #37