current user logic added