Removed the event short circuit form the user service