moving current user logic to service