Start work on a pwauth version of this plugin