diff --git a/1.sources/MyHealth/docroot/header.xhtml b/1.sources/MyHealth/docroot/header.xhtml
index 2e76837..000aba7 100644
--- a/1.sources/MyHealth/docroot/header.xhtml
+++ b/1.sources/MyHealth/docroot/header.xhtml
@@ -14,15 +14,16 @@
 	    function handleLoginRequest(xhr, status, args) {
 	        if(args.validationFailed || !args.loggedIn) {
 	            PF('dlgLogin').jq.effect("shake", {times:5}, 100);
-	            //PF('Login').attr("disabled", false);
+	            PF('btnLogin').enable();
 	        }
 	        else {
+	        	PF('btnLogin').enable();
 	            PF('dlgLogin').hide();
 	        }
 	    }
 	    
 	    function startLogin() {
-	    	//PF('Login').attr("disabled", true);
+	    	PF('btnLogin').disable();
 	    }
 </h:outputScript>
 <h:body>
@@ -57,8 +58,7 @@
 							<p:password id="password" value="#{loginView.password}" />
 						</div>
 						<div class="ui-g-6">
-							<p:commandButton value="Login" update="frmMenu, messages" icon="pi pi-sign-in" action="#{loginView.login}" onstart="startLogin()"
-								oncomplete="handleLoginRequest(xhr, status, args)" />
+							<p:commandButton widgetVar="btnLogin" value="Login" update="messages" icon="pi pi-sign-in" action="#{loginView.login}" onstart="startLogin()" oncomplete="handleLoginRequest(xhr, status, args)" />
 						</div>
 						<div class="ui-g-6">
 							<p:commandButton value="Cancel" icon="pi pi-ban" onclick="PF('dlgLogin').hide();" />
diff --git a/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java b/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java
index f86bf7e..29d8c08 100644
--- a/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java
+++ b/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java
@@ -42,10 +42,11 @@ public class LoginMBean extends ManagedBeanBase {
 
 	public String login() {
 		boolean loggedIn = false;
+		String viewRedirect = "";
 
 		LoggedUserTO usr = null;
 
-		if (username != null && password != null) {
+		if (username != null && password != null && username.equals("") == false && password.equals("") == false) {
 			try {
 				usr = this.getRemoteManagerSystemAdmin().login(username, password);
 
@@ -54,8 +55,7 @@ public class LoginMBean extends ManagedBeanBase {
 					SessionUtils.CreateSession(usr);
 
 					this.addFacesMessageKeep(FacesMessage.SEVERITY_INFO, "Login correcto", "Bienvenido " + usr.getName());
-
-					return ("/home?faces-redirect=true");
+					viewRedirect = "/home?faces-redirect=true";
 				} else
 					this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Loggin Error", "El usuario o la contraseña son incorrectos");
 			} catch (Exception ex) {
@@ -66,8 +66,7 @@ public class LoginMBean extends ManagedBeanBase {
 			this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Loggin Error", "El usuario o la contraseña son incorrectos");
 
 		PrimeFaces.current().ajax().addCallbackParam("loggedIn", loggedIn);
-
-		return "";
+		return viewRedirect;
 	}
 
 	// logout event, invalidate session