diff --git a/client/src/org/compiere/apps/ALogin.java b/client/src/org/compiere/apps/ALogin.java
index 9c46f9e5c8..c6cac03cbc 100644
--- a/client/src/org/compiere/apps/ALogin.java
+++ b/client/src/org/compiere/apps/ALogin.java
@@ -446,8 +446,11 @@ public final class ALogin extends CDialog
 			else
 			{
 				setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-				m_okPressed = true;
-				defaultsOK();	//	disposes
+				m_okPressed = true; 
+				// Dispose if OK - teo_sarca [ 1674663 ]
+				if(!defaultsOK())
+					m_okPressed = false;
+				setCursor(Cursor.getDefaultCursor());
 			}
 		}
 		else if (e.getActionCommand().equals(ConfirmPanel.A_CANCEL))