Fix maker being unable to change own password, access own locked stage