Added user existance check