Make current_user more compact