Bug Fixes in some Authentication cases