diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
index b351e763..0680ba26 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
@@ -86,7 +86,7 @@ public class ReadRemoteFileOperation extends RemoteOperation<RemoteFile> {
             if (status == HttpConstants.HTTP_MULTI_STATUS
                     || status == HttpConstants.HTTP_OK) {
 
-                final RemoteFile file = new RemoteFile(propfind.getRoot(), client.getAccount().getDisplayName());
+                final RemoteFile file = new RemoteFile(propfind.getRoot(), client.getCredentials().getUsername());
 
                 result = new RemoteOperationResult<>(OK);
                 result.setData(file);
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
index dd823218..f80e68cb 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
@@ -88,12 +88,12 @@ public class ReadRemoteFolderOperation extends RemoteOperation<ArrayList<RemoteF
 
                 // parse data from remote folder
                 mFolderAndFiles.add(
-                        new RemoteFile(propfindMethod.getRoot(), client.getAccount().getDisplayName())
+                        new RemoteFile(propfindMethod.getRoot(), client.getCredentials().getUsername())
                 );
 
                 // loop to update every child
                 for (Response resource : propfindMethod.getMembers()) {
-                    RemoteFile file = new RemoteFile(resource, client.getAccount().getDisplayName());
+                    RemoteFile file = new RemoteFile(resource, client.getCredentials().getUsername());
                     mFolderAndFiles.add(file);
                 }
 
diff --git a/src/com/owncloud/android/lib/resources/files/RemoteFile.java b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
index d28462ec..a453e4a4 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoteFile.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
@@ -193,8 +193,8 @@ public class RemoteFile implements Parcelable, Serializable {
         mPrivateLink = null;
     }
 
-    public RemoteFile(final Response davResource, String displayName) {
-        this(getRemotePathFromUrl(davResource.getHref(), displayName));
+    public RemoteFile(final Response davResource, String userName) {
+        this(getRemotePathFromUrl(davResource.getHref(), userName));
         final List<Property> properties = davResource.getProperties();
 
         for(Property property : properties) {