diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/LoginWithPasswordCredentials.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/LoginWithPasswordCredentials.java
index 2f91ec5976..ebc094ed99 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/LoginWithPasswordCredentials.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/LoginWithPasswordCredentials.java
@@ -18,8 +18,6 @@
  */
 package org.jclouds.cloudstack.functions;
 
-import java.io.File;
-
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
@@ -46,9 +44,9 @@ public class LoginWithPasswordCredentials implements Function<Credentials, Login
 
       // domain may be present
       if (username.indexOf('/') != -1) {
-         File domainUsername = new File(username);
-         username = domainUsername.getName();
-         domain = domainUsername.getParent();
+         // username may not end with slash!
+         domain = username.substring(0,username.lastIndexOf('/'));
+         username = username.substring(username.lastIndexOf('/') + 1, username.length());
       }
 
       String hashedPassword = CryptoStreams.md5Hex(input.credential);
@@ -60,4 +58,4 @@ public class LoginWithPasswordCredentials implements Function<Credentials, Login
    public String toString() {
       return "loginWithPasswordCredentials()";
    }
-}
\ No newline at end of file
+}
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/loaders/LoginWithPasswordCredentialsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/loaders/LoginWithPasswordCredentialsTest.java
new file mode 100644
index 0000000000..2ba82b0f97
--- /dev/null
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/loaders/LoginWithPasswordCredentialsTest.java
@@ -0,0 +1,80 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jclouds.cloudstack.loaders;
+
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+
+import org.jclouds.cloudstack.domain.LoginResponse;
+import org.jclouds.cloudstack.features.SessionClient;
+import org.jclouds.domain.Credentials;
+import org.testng.annotations.Test;
+
+public class LoginWithPasswordCredentialsTest {
+
+   /**
+    * This test is different from the single domainname test as it included testing on how the 
+    * domainname is rebuild. It is here to prove that this particular test fails on systems
+    * with a different path separator.
+    */
+   @Test
+   public void testWithDoubleDomainname() {
+      LoginResponse response = createMock(LoginResponse.class);
+      SessionClient client = createMock(SessionClient.class);
+
+      expect(client.loginUserInDomainWithHashOfPassword(eq("User"), eq("Test/Domain"), (String) anyObject())).andReturn(response);
+      replay(client);
+
+      LoginWithPasswordCredentials obj = new LoginWithPasswordCredentials(client);
+      Credentials cred = new Credentials("Test/Domain/User", "koffiedik");
+
+      obj.load(cred);
+   }
+
+   @Test
+   public void testWithSingleDomainname() {
+      LoginResponse response = createMock(LoginResponse.class);
+      SessionClient client = createMock(SessionClient.class);
+
+      expect(client.loginUserInDomainWithHashOfPassword(eq("User"), eq("Domain"), (String) anyObject())).andReturn(response);
+      replay(client);
+
+      LoginWithPasswordCredentials obj = new LoginWithPasswordCredentials(client);
+      Credentials cred = new Credentials("Domain/User", "koffiedik");
+
+      obj.load(cred);
+   }
+
+   @Test
+   public void testWithNoDomainname() {
+       LoginResponse response = createMock(LoginResponse.class);
+       SessionClient client = createMock(SessionClient.class);
+
+       expect(client.loginUserInDomainWithHashOfPassword(eq("User"), eq(""), (String) anyObject())).andReturn(response);
+       replay(client);
+
+       LoginWithPasswordCredentials obj = new LoginWithPasswordCredentials(client);
+       Credentials cred = new Credentials("User", "koffiedik");
+
+       obj.load(cred);
+   }
+}