I think this patch is changing too much right now, committing so I can branch from it to strip it down to password change only