SSO password hash issue: cleanup and fixing