diff --git a/src/net/java/sip/communicator/impl/protocol/msn/ProtocolProviderServiceMsnImpl.java b/src/net/java/sip/communicator/impl/protocol/msn/ProtocolProviderServiceMsnImpl.java
index 412a44a99..30d7c01c6 100644
--- a/src/net/java/sip/communicator/impl/protocol/msn/ProtocolProviderServiceMsnImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/ProtocolProviderServiceMsnImpl.java
@@ -13,6 +13,7 @@
 import net.java.sip.communicator.util.*;
 import net.sf.jml.*;
 import net.sf.jml.event.*;
+import net.sf.jml.exception.*;
 import net.sf.jml.impl.*;
 
 /**
@@ -435,7 +436,14 @@ public void logout(MsnMessenger msnMessenger)
 
         public void exceptionCaught(MsnMessenger msnMessenger, Throwable throwable)
         {
-            logger.error("Error in Msn lib ", throwable);
+            if(throwable instanceof IncorrectPasswordException)
+                fireRegistrationStateChanged(
+                    getRegistrationState(),
+                    RegistrationState.UNREGISTERED,
+                    RegistrationStateChangeEvent.REASON_AUTHENTICATION_FAILED,
+                    "Incorrect Password");
+            else
+                logger.error("Error in Msn lib ", throwable);
         }
     }
 }