Working on fully populating credentials on auth