Added user check