diff --git a/addons/smtpclient/smtpclient.py b/addons/smtpclient/smtpclient.py
index 36b49c77bea..33ba1585df4 100644
--- a/addons/smtpclient/smtpclient.py
+++ b/addons/smtpclient/smtpclient.py
@@ -302,7 +302,10 @@ class smtpclient(osv.osv):
                     
                 if self.server[serverid]['auth']:
                     password = self.server[serverid]['password']
-                    password = base64.b64decode(password)
+                    try:
+                        password = base64.b64decode(password)
+                    except:
+                        pass  
                     self.smtpServer[serverid].login(str(self.server[serverid]['user']), password)
 
             except Exception, e: