Changes to support the first authenticate user call