Changes for firstTimeUserLogin