diff --git a/dbs/clinica.mv.db b/dbs/clinica.mv.db
index 8485308..f1c0b64 100644
Binary files a/dbs/clinica.mv.db and b/dbs/clinica.mv.db differ
diff --git a/server/setup/_schema-form-1-consulta.js b/server/setup/_schema-form-1-consulta.js
index 8be221a..4d4de68 100644
--- a/server/setup/_schema-form-1-consulta.js
+++ b/server/setup/_schema-form-1-consulta.js
@@ -164,7 +164,7 @@ _form.createComponentIfNotExists(
 	.set("firebase", "")
 	.set("group_id", 0)
 	.set("height", 0)
-	.set("mandatory", true)
+	.set("mandatory", false)
 	.set("max", 0)
 	.set("min", 0)
 	.set("name", "paciente_id")
diff --git a/server/setup/_schema-form-5-medico_agenda.js b/server/setup/_schema-form-5-medico_agenda.js
deleted file mode 100644
index 15588b6..0000000
--- a/server/setup/_schema-form-5-medico_agenda.js
+++ /dev/null
@@ -1,196 +0,0 @@
-/**
-  *
-  *  CODE GENERATED AUTOMATICALLY
-  *
-  *  THIS FILE SHOULD NOT BE EDITED BY HAND
-  *
-  */
-
-_form.createIfNotExists(
-	_val.map()
-	.set("big", false)
-	.set("control_active", true)
-	.set("control_group", false)
-	.set("control_user", false)
-	.set("description", "<p>Hor\u00E1rios dispon\u00EDveis para marcar consulta com cada m\u00E9dico</p>")
-	.set("export_id", false)
-	.set("export_json", true)
-	.set("export_lastchange", false)
-	.set("export_uid", true)
-	.set("export_xls", true)
-	.set("export_xml", true)
-	.set("firebase", "")
-	.set("group_uid", "027bf7a4-a130-481c-807f-1f4bedaf5f45")
-	.set("name", "medico_agenda")
-	.set("parent_uid", "de3d9a55-c0d6-4b53-ad8d-da3c46da80ea")
-	.set("reorder", 0)
-	.set("report", false)
-	.set("report_behaviour", 0)
-	.set("show_id", true)
-	.set("title", "Agenda")
-	.set("uid", "1f6eddf6-2026-41e2-b700-003769b3ea32")
-	.set("user_uid", "678201a1-1c85-4819-a1b6-600e6217b020")
-)
-_form.createComponentIfNotExists(
-	"1f6eddf6-2026-41e2-b700-003769b3ea32",
-	_val.map()
-	.set("colspan", 0)
-	.set("description", "")
-	.set("edit_group_uid", "027bf7a4-a130-481c-807f-1f4bedaf5f45")
-	.set("edit_user_uid", "678201a1-1c85-4819-a1b6-600e6217b020")
-	.set("firebase", "")
-	.set("group_id", 0)
-	.set("height", 0)
-	.set("mandatory", true)
-	.set("max", 0)
-	.set("min", 0)
-	.set("name", "convenio_id")
-	.set("properties", "{\"COLUMN_SEPARATOR\":{\"default\":\" - \",\"type\":\"LINK_SEPARATOR\",\"value\":\" - \"},\"LINK\":{\"default\":\"\",\"type\":\"LINK\",\"value\":\"convenio:nome\"},\"MAX_COLUMN_LENGTH\":{\"default\":\"0\",\"type\":\"INTEGER\",\"value\":\"0\"},\"ONLY_ACTIVES\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"},\"SERVICE\":{\"default\":\"com/Select.netuno\",\"type\":\"STRING\",\"value\":\"com/Select.netuno\"}}")
-	.set("rowspan", 0)
-	.set("tdheight", 0)
-	.set("tdwidth", 0)
-	.set("title", "conv\u00EAnio")
-	.set("type", "select")
-	.set("uid", "46319c16-b24f-4afe-9978-c6577ed78697")
-	.set("unique", false)
-	.set("user_id", 0)
-	.set("whenedit", true)
-	.set("whenexport", true)
-	.set("whenfilter", true)
-	.set("whennew", true)
-	.set("whenresult", true)
-	.set("whenview", true)
-	.set("width", 0)
-	.set("x", 1)
-	.set("y", 5)
-)
-_form.createComponentIfNotExists(
-	"1f6eddf6-2026-41e2-b700-003769b3ea32",
-	_val.map()
-	.set("colspan", 0)
-	.set("description", "")
-	.set("edit_group_uid", "027bf7a4-a130-481c-807f-1f4bedaf5f45")
-	.set("edit_user_uid", "678201a1-1c85-4819-a1b6-600e6217b020")
-	.set("firebase", "")
-	.set("group_id", 0)
-	.set("height", 0)
-	.set("mandatory", true)
-	.set("max", 0)
-	.set("min", 0)
-	.set("name", "dia")
-	.set("properties", "{\"DEFAULT_CURRENT\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"}}")
-	.set("rowspan", 0)
-	.set("tdheight", 0)
-	.set("tdwidth", 0)
-	.set("title", "dia")
-	.set("type", "date")
-	.set("uid", "83319de3-254e-4d8f-b71f-93858125a95d")
-	.set("unique", false)
-	.set("user_id", 0)
-	.set("whenedit", true)
-	.set("whenexport", true)
-	.set("whenfilter", true)
-	.set("whennew", true)
-	.set("whenresult", true)
-	.set("whenview", true)
-	.set("width", 0)
-	.set("x", 1)
-	.set("y", 2)
-)
-_form.createComponentIfNotExists(
-	"1f6eddf6-2026-41e2-b700-003769b3ea32",
-	_val.map()
-	.set("colspan", 0)
-	.set("description", "")
-	.set("edit_group_uid", "027bf7a4-a130-481c-807f-1f4bedaf5f45")
-	.set("edit_user_uid", "678201a1-1c85-4819-a1b6-600e6217b020")
-	.set("firebase", "")
-	.set("group_id", 0)
-	.set("height", 0)
-	.set("mandatory", true)
-	.set("max", 0)
-	.set("min", 0)
-	.set("name", "hora")
-	.set("properties", "{\"DEFAULT_CURRENT\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"}}")
-	.set("rowspan", 0)
-	.set("tdheight", 0)
-	.set("tdwidth", 0)
-	.set("title", "hora")
-	.set("type", "time")
-	.set("uid", "5e7edd1a-37d1-41db-b17d-7700c881c6d1")
-	.set("unique", false)
-	.set("user_id", 0)
-	.set("whenedit", true)
-	.set("whenexport", true)
-	.set("whenfilter", true)
-	.set("whennew", true)
-	.set("whenresult", true)
-	.set("whenview", true)
-	.set("width", 0)
-	.set("x", 1)
-	.set("y", 3)
-)
-_form.createComponentIfNotExists(
-	"1f6eddf6-2026-41e2-b700-003769b3ea32",
-	_val.map()
-	.set("colspan", 0)
-	.set("description", "")
-	.set("firebase", "")
-	.set("group_id", 0)
-	.set("height", 0)
-	.set("mandatory", true)
-	.set("max", 0)
-	.set("min", 0)
-	.set("name", "medico_id")
-	.set("properties", "{\"COLUMN_SEPARATOR\":{\"default\":\" - \",\"type\":\"LINK_SEPARATOR\",\"value\":\" - \"},\"LINK\":{\"default\":\"\",\"type\":\"LINK\",\"value\":\"medico:nome,c_r_m\"},\"MAX_COLUMN_LENGTH\":{\"default\":\"0\",\"type\":\"INTEGER\",\"value\":\"0\"},\"ONLY_ACTIVES\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"},\"SERVICE\":{\"default\":\"com/Select.netuno\",\"type\":\"STRING\",\"value\":\"com/Select.netuno\"}}")
-	.set("rowspan", 0)
-	.set("tdheight", 0)
-	.set("tdwidth", 0)
-	.set("title", "m\u00E9dico")
-	.set("type", "select")
-	.set("uid", "0fa4fe57-49b4-4d40-88f4-441e2027d7b5")
-	.set("unique", false)
-	.set("user_id", 0)
-	.set("whenedit", true)
-	.set("whenexport", true)
-	.set("whenfilter", true)
-	.set("whennew", true)
-	.set("whenresult", true)
-	.set("whenview", true)
-	.set("width", 0)
-	.set("x", 1)
-	.set("y", 1)
-)
-_form.createComponentIfNotExists(
-	"1f6eddf6-2026-41e2-b700-003769b3ea32",
-	_val.map()
-	.set("colspan", 0)
-	.set("description", "")
-	.set("edit_group_uid", "027bf7a4-a130-481c-807f-1f4bedaf5f45")
-	.set("edit_user_uid", "678201a1-1c85-4819-a1b6-600e6217b020")
-	.set("firebase", "")
-	.set("group_id", 0)
-	.set("height", 0)
-	.set("mandatory", true)
-	.set("max", 0)
-	.set("min", 0)
-	.set("name", "retorno")
-	.set("properties", "{\"DEFAULT\":{\"default\":\"true\",\"type\":\"BOOLEAN\",\"value\":\"true\"}}")
-	.set("rowspan", 0)
-	.set("tdheight", 0)
-	.set("tdwidth", 0)
-	.set("title", "retorno")
-	.set("type", "checkbox")
-	.set("uid", "74e988f7-0c62-4d96-ac89-6615fa0df5dc")
-	.set("unique", false)
-	.set("user_id", 0)
-	.set("whenedit", true)
-	.set("whenexport", true)
-	.set("whenfilter", false)
-	.set("whennew", true)
-	.set("whenresult", true)
-	.set("whenview", true)
-	.set("width", 0)
-	.set("x", 1)
-	.set("y", 4)
-)
diff --git a/server/setup/_schema-form-6-medico_convenio.js b/server/setup/_schema-form-5-medico_convenio.js
similarity index 100%
rename from server/setup/_schema-form-6-medico_convenio.js
rename to server/setup/_schema-form-5-medico_convenio.js
diff --git a/server/setup/_schema-form-7-medico_especialidade.js b/server/setup/_schema-form-6-medico_especialidade.js
similarity index 100%
rename from server/setup/_schema-form-7-medico_especialidade.js
rename to server/setup/_schema-form-6-medico_especialidade.js
diff --git a/server/setup/_schema-form-8-paciente.js b/server/setup/_schema-form-7-paciente.js
similarity index 100%
rename from server/setup/_schema-form-8-paciente.js
rename to server/setup/_schema-form-7-paciente.js
diff --git a/server/setup/_schema-form-9-paciente_convenio.js b/server/setup/_schema-form-8-paciente_convenio.js
similarity index 100%
rename from server/setup/_schema-form-9-paciente_convenio.js
rename to server/setup/_schema-form-8-paciente_convenio.js