Added a check on user