fixed issues with current user parsing