Changed so that passwords are only numbered if called with -m