Generalise to admin-password

… & fix bug which meant it only worked for user-password