diff --git a/backend/internal/profissionais/handler.go b/backend/internal/profissionais/handler.go
index fd169e8..dc07122 100644
--- a/backend/internal/profissionais/handler.go
+++ b/backend/internal/profissionais/handler.go
@@ -89,6 +89,10 @@ func toResponse(p interface{}) ProfissionalResponse {
 			AvatarURL:           fromPgText(v.AvatarUrl),
 		}
 	case generated.ListProfissionaisRow:
+		email := fromPgText(v.Email)
+		if email == nil {
+			email = fromPgText(v.UsuarioEmail)
+		}
 		return ProfissionalResponse{
 			ID:                   uuid.UUID(v.ID.Bytes).String(),
 			UsuarioID:            uuid.UUID(v.UsuarioID.Bytes).String(),
@@ -116,7 +120,7 @@ func toResponse(p interface{}) ProfissionalResponse {
 			TabelaFree:           fromPgText(v.TabelaFree),
 			ExtraPorEquipamento:  fromPgBool(v.ExtraPorEquipamento),
 			Equipamentos:         fromPgText(v.Equipamentos),
-			Email:                fromPgText(v.Email),
+			Email:                email,
 			AvatarURL:            fromPgText(v.AvatarUrl),
 		}
 	case generated.GetProfissionalByIDRow:
@@ -147,6 +151,7 @@ func toResponse(p interface{}) ProfissionalResponse {
 			TabelaFree:           fromPgText(v.TabelaFree),
 			ExtraPorEquipamento:  fromPgBool(v.ExtraPorEquipamento),
 			Equipamentos:         fromPgText(v.Equipamentos),
+			Email:                fromPgText(v.Email),
 			AvatarURL:            fromPgText(v.AvatarUrl),
 		}
 	default:
diff --git a/frontend/components/EventScheduler.tsx b/frontend/components/EventScheduler.tsx
index 92c1fd6..cc1ff54 100644
--- a/frontend/components/EventScheduler.tsx
+++ b/frontend/components/EventScheduler.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from "react";
 import { Plus, Trash, User, Truck, MapPin } from "lucide-react";
 import { useAuth } from "../contexts/AuthContext";
-import { listEscalas, createEscala, deleteEscala, EscalaInput } from "../services/apiService";
+import { listEscalas, createEscala, deleteEscala, EscalaInput, getFunctions } from "../services/apiService";
 import { useData } from "../contexts/DataContext";
 import { UserRole } from "../types";
 
@@ -23,6 +23,7 @@ const EventScheduler: React.FC<EventSchedulerProps> = ({ agendaId, dataEvento, a
     const { token, user } = useAuth();
     const { professionals, events } = useData();
     const [escalas, setEscalas] = useState<any[]>([]);
+    const [roles, setRoles] = useState<{ id: string; nome: string }[]>([]);
     const [loading, setLoading] = useState(false);
 
     // New entry state
@@ -78,6 +79,9 @@ const EventScheduler: React.FC<EventSchedulerProps> = ({ agendaId, dataEvento, a
     useEffect(() => {
         if (agendaId && token) {
             fetchEscalas();
+            getFunctions().then(res => {
+                if (res.data) setRoles(res.data);
+            });
         }
     }, [agendaId, token]);
 
@@ -143,10 +147,11 @@ const EventScheduler: React.FC<EventSchedulerProps> = ({ agendaId, dataEvento, a
     };
 
     // 1. Start with all professionals or just the allowed ones
-    let availableProfs = professionals;
+    // FILTER: Only show professionals with a valid role (Function), matching "Equipe" page logic.
+    let availableProfs = professionals.filter(p => roles.some(r => r.id === p.funcao_profissional_id));
     const allowedMap = new Map<string, string>(); // ID -> Status
 
-    if (allowedProfessionals && allowedProfessionals.length > 0) {
+    if (allowedProfessionals) {
         // Normalize allowed list
         const ids: string[] = [];
         allowedProfessionals.forEach((p: any) => {
diff --git a/frontend/components/ProfessionalDetailsModal.tsx b/frontend/components/ProfessionalDetailsModal.tsx
index 496a5bc..d8ceecd 100644
--- a/frontend/components/ProfessionalDetailsModal.tsx
+++ b/frontend/components/ProfessionalDetailsModal.tsx
@@ -80,7 +80,7 @@ export const ProfessionalDetailsModal: React.FC<ProfessionalDetailsModalProps> =
                     <div
                         className="w-32 h-32 rounded-full border-4 border-white bg-white shadow-lg mb-4 bg-gray-200"
                         style={{
-                            backgroundImage: `url(${professional.avatar || `https://ui-avatars.com/api/?name=${encodeURIComponent(professional.name || professional.nome)}&background=random`})`,
+                            backgroundImage: `url(${professional.avatar_url || professional.avatar || `https://ui-avatars.com/api/?name=${encodeURIComponent(professional.name || professional.nome)}&background=random`})`,
                             backgroundSize: 'cover',
                             backgroundPosition: 'center'
                         }}
diff --git a/frontend/components/ProfessionalForm.tsx b/frontend/components/ProfessionalForm.tsx
index cd51ed6..55e211b 100644
--- a/frontend/components/ProfessionalForm.tsx
+++ b/frontend/components/ProfessionalForm.tsx
@@ -611,7 +611,7 @@ export const ProfessionalForm: React.FC<ProfessionalFormProps> = ({
 
           <div>
             <label className="block text-sm font-medium text-gray-700 mb-1">
-              Nome do Titular da Conta ou Observação
+              Observações
             </label>
             <textarea
               value={formData.observacao}