Some bug fix for Auth/Passwording