Updated with password recovery module