Added proper validations for current users