User shell definition is moved to the right place