Added following check on user