Added user checking