Fix current user helper methods