Fix for current user in calendar