diff --git a/1.sources/MyHealth/docroot/systemAdmin/ManageSpecialties.xhtml b/1.sources/MyHealth/docroot/systemAdmin/ManageSpecialties.xhtml
index 04ba735..57086b2 100644
--- a/1.sources/MyHealth/docroot/systemAdmin/ManageSpecialties.xhtml
+++ b/1.sources/MyHealth/docroot/systemAdmin/ManageSpecialties.xhtml
@@ -6,9 +6,9 @@
 
 <ui:composition template="../header.xhtml">
 	<ui:define name="content">
-		<h:form id="frmManageSpecialties">
-			<p:growl id="mesgs" showDetail="true" closable="true" autoupdate="true" />
-			<p:panel id="PanelMS" header="Modificación y borrado de especialidades">
+		<h:form id="frmEditSpecialties">
+			<p:growl id="mesgsEdit" showDetail="true" closable="true" autoupdate="true" />
+			<p:panel id="PanelMS" style="margin-bottom: 10px;" header="Modificación y borrado de especialidades">
 				<div class="ui-g ui-fluid">
 					<div class="ui-g-2 ui-md-2">
 					<p:outputLabel for="ms"/>
@@ -23,42 +23,47 @@
 						<p:outputLabel value="Nombre: " for="name"/>
 					</div>
 					<div class="ui-g-2 ui-md-2">
-						<p:inputText id="name" value="#{ManageSpecialities.medicalSpecialty.name}" readonly="false" required="true" requiredMessage="Es necesario un nombre" />
+						<p:inputText id="name" value="#{ManageSpecialities.medicalSpecialty.name}" converter="omnifaces.TrimConverter" readonly="false" required="true" requiredMessage="Es necesario un nombre" />
 					</div>
 					<div class="ui-g-1 ui-md-1">
 						<p:outputLabel value="Descripción: " for="description" />
 					</div>
 					<div class="ui-g-4 ui-md-4">
-						<p:inputText id="description" value="#{ManageSpecialities.medicalSpecialty.description}" readonly="false" required="true" requiredMessage="Es necesaria una descripción" />
+						<p:inputText id="description" value="#{ManageSpecialities.medicalSpecialty.description}" converter="omnifaces.TrimConverter" readonly="false" required="true" requiredMessage="Es necesaria una descripción" />
 					</div>
 					<div class="ui-g-1 ui-md-1 ">
-						<p:commandButton validateClient="true" value="Guardar" update="mesgs" action="#{ManageSpecialities.saveData}" icon="pi pi-save" />
+						<p:commandButton validateClient="true" value="Guardar" update="mesgsEdit frmEditSpecialties" action="#{ManageSpecialities.saveData}" icon="pi pi-save" />
 					</div>
 					<div class="ui-g-1 ui-md-1 ">
-						<p:commandButton validateClient="true" value="Borrar" update="mesgs" action="#{ManageSpecialities.deleteData}" icon="fa fa-remove" />
+						<p:commandButton validateClient="true" value="Borrar" update="mesgsEdit frmEditSpecialties" action="#{ManageSpecialities.deleteData}" icon="fa fa-remove" />
 					</div>
 			    </div>
     		</p:panel>
-
+		</h:form>
+		
+		<h:form id="frmAddSpecialties">
+			<p:growl id="mesgsAdd" showDetail="true" closable="true" autoupdate="true" />
 			<p:panel id="PanelNewMS" header="Alta de especialidades">
 				<div class="ui-g ui-fluid">
-					<div class="ui-g-1 ui-md-1" >
-						<p:outputLabel value="Nombre: " for="nameNew"/>
+					<div class="ui-g-1 ui-md-1">
+						<p:outputLabel value="Nombre: " for="nameNew" />
 					</div>
 					<div class="ui-g-2 ui-md-2">
-						<p:inputText id="nameNew" value="#{ManageSpecialities.name}" readonly="false" required="ManageSpecialities.medicalSpecialty.name eq null" requiredMessage="Es necesario un nombre" />
+						<p:inputText id="nameNew" value="#{ManageSpecialities.name}" readonly="false" required="ManageSpecialities.medicalSpecialty.name eq null"
+							requiredMessage="Es necesario un nombre" />
 					</div>
 					<div class="ui-g-1 ui-md-1">
 						<p:outputLabel value="Descripción: " for="descriptionNew" />
 					</div>
 					<div class="ui-g-6 ui-md-6">
-						<p:inputText id="descriptionNew" value="#{ManageSpecialities.description}" readonly="false" required="ManageSpecialities.medicalSpecialty.description eq null" requiredMessage="Es necesaria una descripción" />
+						<p:inputText id="descriptionNew" value="#{ManageSpecialities.description}" readonly="false" required="ManageSpecialities.medicalSpecialty.description eq null"
+							requiredMessage="Es necesaria una descripción" />
 					</div>
 					<div class="ui-g-2 ui-md-2 ">
-						<p:commandButton validateClient="true" value="Crear" update="mesgs" action="#{ManageSpecialities.insertData}" icon="pi pi-check" />
+						<p:commandButton validateClient="true" value="Crear" update="mesgsAdd frmAddSpecialties frmEditSpecialties" action="#{ManageSpecialities.insertData}" icon="pi pi-check" />
 					</div>
-			    </div>
-    		</p:panel>
+				</div>
+			</p:panel>
 		</h:form>
 	</ui:define>
 </ui:composition>
diff --git a/1.sources/MyHealth/src/managedbean/systemAdmin/ManageSpecialitiesMBean.java b/1.sources/MyHealth/src/managedbean/systemAdmin/ManageSpecialitiesMBean.java
index c225f76..f079867 100644
--- a/1.sources/MyHealth/src/managedbean/systemAdmin/ManageSpecialitiesMBean.java
+++ b/1.sources/MyHealth/src/managedbean/systemAdmin/ManageSpecialitiesMBean.java
@@ -95,11 +95,11 @@ public class ManageSpecialitiesMBean extends ManagedBeanBase implements Serializ
 	public void saveData() {
 		int error = 0;
 
-		if (this.medicalSpecialty.getName() == null) {
+		if (this.medicalSpecialty.getName() == null || this.medicalSpecialty.getName().trim().length() == 0) {
 			this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Nombre no relleno", "Por favor, escriba un nombre de especialidad.");
 			error++;
 		}
-		if (this.medicalSpecialty.getDescription() == null) {
+		if (this.medicalSpecialty.getDescription() == null || this.medicalSpecialty.getDescription().trim().length() == 0) {
 			this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Descripción no rellena", "Por favor, escriba una descripción.");
 			error++;
 		}
@@ -109,6 +109,7 @@ public class ManageSpecialitiesMBean extends ManagedBeanBase implements Serializ
 				MedicalSpecialtyTO ms = this.getRemoteManagerSystemAdmin().updateSpecialtyData(this.medicalSpecialty.getId(), this.medicalSpecialty.getName(), this.medicalSpecialty.getDescription());
 				this.setSpecialtyData(ms);
 				this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Los datos se han guardado", "Los datos de la especialidad se han guardado correctamente.");
+				this.medicalSpecialitiesList = this.getRemoteManagerCommon().listMedicalSpecialitiesPaged(0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH);
 			} catch (Exception e) {
 				this.manageException(e);
 			}
@@ -131,6 +132,7 @@ public class ManageSpecialitiesMBean extends ManagedBeanBase implements Serializ
 			try {
 				this.getRemoteManagerSystemAdmin().deleteSpecialtyData(this.medicalSpecialty.getId(), this.medicalSpecialty.getName(), this.medicalSpecialty.getDescription());
 				this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Los especialidad se ha borrado", "Los datos de la especialidad se han borrado correctamente.");
+				this.medicalSpecialitiesList = this.getRemoteManagerCommon().listMedicalSpecialitiesPaged(0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH);
 			} catch (Exception e) {
 				this.manageException(e);
 			}
@@ -154,6 +156,7 @@ public class ManageSpecialitiesMBean extends ManagedBeanBase implements Serializ
 				MedicalSpecialtyTO ms = this.getRemoteManagerSystemAdmin().insertSpecialtyData(name, description);
 				this.setSpecialtyData(ms);
 				this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Los datos se han guardado", "Los datos de la especialidad se han guardado correctamente.");
+				this.medicalSpecialitiesList = this.getRemoteManagerCommon().listMedicalSpecialitiesPaged(0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH);
 			} catch (Exception e) {
 				this.manageException(e);
 			}