Fixed the 'null' currentStepId from user