Starting with our own passwords controller
Fixing a regression issue