diff --git a/test/integration/component/test_accounts.py b/test/integration/component/test_accounts.py
index b5861766f5e..3c284bd0fcd 100644
--- a/test/integration/component/test_accounts.py
+++ b/test/integration/component/test_accounts.py
@@ -1559,9 +1559,8 @@ class TestUserLogin(cloudstackTestCase):
         respose = User.login(
                              self.apiclient,
                              username=self.account.name,
-                             password=self.services["account"]["password"]
-                             )
-        self.assertEqual(respose, None, "Login response should not be none")
+                             password=self.services["account"]["password"],
+                             domainid=domain.id)
         self.debug("Login API response: %s" % respose)
 
         self.assertNotEqual(
diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py
index 00dc506f1b1..6e49ae5e70a 100755
--- a/tools/marvin/marvin/integration/lib/base.py
+++ b/tools/marvin/marvin/integration/lib/base.py
@@ -148,10 +148,7 @@ class User:
         if "userUUID" in services:
             cmd.userid = "-".join([services["userUUID"],random_gen()])
 
-        # Password Encoding
-        mdf = hashlib.md5()
-        mdf.update(services["password"])
-        cmd.password = mdf.hexdigest()
+        cmd.password = services["password"]
         cmd.username = "-".join([services["username"], random_gen()])
         user = apiclient.createUser(cmd)
 
@@ -201,14 +198,11 @@ class User:
 
         cmd = login.loginCmd()
         cmd.username = username
-        # MD5 hashcoded password
-        mdf = hashlib.md5()
-        mdf.update(password)
-        cmd.password = mdf.hexdigest()
+        cmd.password = password
         if domain:
             cmd.domain = domain
         if domainid:
-            cmd.domainid = domainid
+            cmd.domainId = domainid
         return apiclient.login(cmd)