no message

src/main/webapp/WEB-INF/jsp/login.jsp

@@ -104,39 +104,45 @@ ${functions}
 function login() {
 	if (!$("#formAuthentication input").validInputs()) return;
 	
-	
-	
 	var params = {
 		account:$("#userId").val(),
 		password:$("#password").val(),
 		institute:$("#institute").val()
 		<%--, rememberCredentials:true--%>
 	};
+	
 	json.post({
 		url:wctx.url("/login.do"),
 		data:params,
 		success:function(resp) {
-			if (resp.authenticated) {
-				if (resp.message)
+			if (!(resp.authenticated)) {
 				dialog.alert({
-						content : resp.message,
+					content:resp.reason,
 					init : function() { 
 						setDialogZindex();
 						focusClose(); 
 					},
+					onClose:() => $("#userId").focus()
 				});
+				return;
+			}
 			
-				wctx.home();
-			} else {
+			if(resp.message){
 				dialog.alert({
-					content:resp.reason,
+					content : resp.message,
 					init : function() { 
 						setDialogZindex();
 						focusClose(); 
 					},
-					onClose:() => $("#userId").focus()
+					onOK : function() { 
+						wctx.home();
+					}
 				});
+				return;
 			}
+			
+			wctx.home();
+			
 		}
 	});
 }