Add Password methods and cleanup users plugin methods