Fixed some issues in Auth System