diff --git a/skpy/conn.py b/skpy/conn.py
index 0455e84..ab3eef7 100644
--- a/skpy/conn.py
+++ b/skpy/conn.py
@@ -367,7 +367,8 @@ def setUserPwd(self, user, pwd):
             user (str): username or email address of the connecting account
             pwd (str): password of the connecting account
         """
-        self.skypeTokenClosure(self.soapLogin, user, pwd)
+        login = self.soapLogin if "@" in user else self.liveLogin
+        self.skypeTokenClosure(login, user, pwd)
 
     def liveLogin(self, user, pwd):
         """