added logic to valid user step