Fixed issues saving users