diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index e72baa9..bc9ae5f 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -4,7 +4,9 @@ spring.datasource.url=jdbc:postgresql://localhost:5432/arende
 spring.datasource.username=arende
 spring.datasource.password=arende
 
-spring.jpa.hibernate.ddl-auto=update
+spring.jpa.hibernate.ddl-auto=create-drop
+spring.sql.init.mode=always
+spring.jpa.defer-datasource-initialization=true
 spring.datasource.driver-class-name=org.postgresql.Driver
 spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
 
diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
new file mode 100644
index 0000000..f763aba
--- /dev/null
+++ b/src/main/resources/data.sql
@@ -0,0 +1,34 @@
+-- Seed Patients
+INSERT INTO patients (id, first_name, last_name, personal_identity_number, created_at)
+VALUES ('550e8400-e29b-41d4-a716-446655440000', 'John', 'Doe', '19850512-1234', CURRENT_TIMESTAMP)
+ON CONFLICT (id) DO NOTHING;
+
+INSERT INTO patients (id, first_name, last_name, personal_identity_number, created_at)
+VALUES ('550e8400-e29b-41d4-a716-446655440001', 'Jane', 'Smith', '19920824-5678', CURRENT_TIMESTAMP)
+ON CONFLICT (id) DO NOTHING;
+
+INSERT INTO patients (id, first_name, last_name, personal_identity_number, created_at)
+VALUES ('550e8400-e29b-41d4-a716-446655440002', 'Anders', 'Andersson', '19780315-9012', CURRENT_TIMESTAMP)
+ON CONFLICT (id) DO NOTHING;
+
+-- Seed Employees
+INSERT INTO employees (id, display_name, role, created_at)
+VALUES ('770e8400-e29b-41d4-a716-446655440000', 'Admin User', 'ADMIN', CURRENT_TIMESTAMP)
+ON CONFLICT (id) DO NOTHING;
+
+INSERT INTO employees (id, display_name, role, created_at)
+VALUES ('770e8400-e29b-41d4-a716-446655440001', 'Dr. Alice Roberts', 'CASE_OWNER', CURRENT_TIMESTAMP)
+ON CONFLICT (id) DO NOTHING;
+
+INSERT INTO employees (id, display_name, role, created_at)
+VALUES ('770e8400-e29b-41d4-a716-446655440002', 'Nurse Bob Jones', 'HANDLER', CURRENT_TIMESTAMP)
+ON CONFLICT (id) DO NOTHING;
+
+-- Seed Cases
+INSERT INTO cases (id, title, description, status, patient_id, owner_id, handler_id, created_at)
+VALUES ('990e8400-e29b-41d4-a716-446655440000', 'Acute Chest Pain', 'Patient arrived with severe chest pain and shortness of breath.', 'OPEN', '550e8400-e29b-41d4-a716-446655440000', '770e8400-e29b-41d4-a716-446655440001', '770e8400-e29b-41d4-a716-446655440002', CURRENT_TIMESTAMP)
+ON CONFLICT (id) DO NOTHING;
+
+INSERT INTO cases (id, title, description, status, patient_id, owner_id, handler_id, created_at)
+VALUES ('990e8400-e29b-41d4-a716-446655440001', 'Follow-up: Fracture', 'Routine follow-up for a healed radial fracture.', 'OPEN', '550e8400-e29b-41d4-a716-446655440001', '770e8400-e29b-41d4-a716-446655440001', '770e8400-e29b-41d4-a716-446655440002', CURRENT_TIMESTAMP)
+ON CONFLICT (id) DO NOTHING;
diff --git a/src/main/resources/templates/cases/new.html b/src/main/resources/templates/cases/new.html
index e46d3d4..37a04ac 100644
--- a/src/main/resources/templates/cases/new.html
+++ b/src/main/resources/templates/cases/new.html
@@ -12,6 +12,14 @@ <h1>Create case</h1>
     </div>
 
     <form class="form" th:action="@{/ui/cases/new}" th:object="${createCaseForm}" method="post">
+        <label class="field">
+            <span class="label">Patient</span>
+            <select class="input" th:field="*{patientId}">
+                <option value="">-- Select Patient --</option>
+                <option th:each="p : ${patients}" th:value="${p.id}" th:text="${p.firstName + ' ' + p.lastName}"></option>
+            </select>
+            <span class="muted" th:if="${#fields.hasErrors('patientId')}" th:errors="*{patientId}" style="color: var(--danger)">Error</span>
+        </label>
         <label class="field">
             <span class="label">Title</span>
             <input class="input" th:field="*{title}" maxlength="200"/>
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index 898f789..d25a878 100644
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -9,6 +9,8 @@ spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
 
 # Create schema on startup
 spring.jpa.hibernate.ddl-auto=create-drop
+spring.jpa.defer-datasource-initialization=true
+spring.sql.init.data-locations=classpath:data-test.sql
 
 # Show SQL in logs for easier debugging during tests
 spring.jpa.show-sql=true
diff --git a/src/test/resources/data-test.sql b/src/test/resources/data-test.sql
new file mode 100644
index 0000000..c5fe66e
--- /dev/null
+++ b/src/test/resources/data-test.sql
@@ -0,0 +1,26 @@
+-- Seed Patients
+INSERT INTO patients (id, first_name, last_name, personal_identity_number, created_at)
+VALUES ('550e8400-e29b-41d4-a716-446655440000', 'John', 'Doe', '19850512-1234', CURRENT_TIMESTAMP);
+
+INSERT INTO patients (id, first_name, last_name, personal_identity_number, created_at)
+VALUES ('550e8400-e29b-41d4-a716-446655440001', 'Jane', 'Smith', '19920824-5678', CURRENT_TIMESTAMP);
+
+INSERT INTO patients (id, first_name, last_name, personal_identity_number, created_at)
+VALUES ('550e8400-e29b-41d4-a716-446655440002', 'Anders', 'Andersson', '19780315-9012', CURRENT_TIMESTAMP);
+
+-- Seed Employees
+INSERT INTO employees (id, display_name, role, created_at)
+VALUES ('770e8400-e29b-41d4-a716-446655440000', 'Admin User', 'ADMIN', CURRENT_TIMESTAMP);
+
+INSERT INTO employees (id, display_name, role, created_at)
+VALUES ('770e8400-e29b-41d4-a716-446655440001', 'Dr. Alice Roberts', 'CASE_OWNER', CURRENT_TIMESTAMP);
+
+INSERT INTO employees (id, display_name, role, created_at)
+VALUES ('770e8400-e29b-41d4-a716-446655440002', 'Nurse Bob Jones', 'HANDLER', CURRENT_TIMESTAMP);
+
+-- Seed Cases
+INSERT INTO cases (id, title, description, status, patient_id, owner_id, handler_id, created_at)
+VALUES ('990e8400-e29b-41d4-a716-446655440000', 'Acute Chest Pain', 'Patient arrived with severe chest pain and shortness of breath.', 'OPEN', '550e8400-e29b-41d4-a716-446655440000', '770e8400-e29b-41d4-a716-446655440001', '770e8400-e29b-41d4-a716-446655440002', CURRENT_TIMESTAMP);
+
+INSERT INTO cases (id, title, description, status, patient_id, owner_id, handler_id, created_at)
+VALUES ('990e8400-e29b-41d4-a716-446655440001', 'Follow-up: Fracture', 'Routine follow-up for a healed radial fracture.', 'OPEN', '550e8400-e29b-41d4-a716-446655440001', '770e8400-e29b-41d4-a716-446655440001', '770e8400-e29b-41d4-a716-446655440002', CURRENT_TIMESTAMP);