Added checks to determine default shell used