diff --git a/IF.Lastfm.Core/Api/IUserApi.cs b/IF.Lastfm.Core/Api/IUserApi.cs
index c9830a9..7009477 100644
--- a/IF.Lastfm.Core/Api/IUserApi.cs
+++ b/IF.Lastfm.Core/Api/IUserApi.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using IF.Lastfm.Core.Api.Enums;
 using IF.Lastfm.Core.Api.Helpers;
@@ -11,14 +10,16 @@ public interface IUserApi
     {
         IAuth Auth { get; }
 
-        Task<PageResponse<Album>> GetTopAlbums(LastStatsTimeSpan span,
-                                              int startIndex = 0,
-                                              int endIndex = LastFm.DefaultPageLength);
+        Task<PageResponse<Album>> GetTopAlbums(string username,
+            LastStatsTimeSpan span,
+            int startIndex = 0,
+            int endIndex = LastFm.DefaultPageLength);
 
         Task<PageResponse<Track>> GetRecentScrobbles(string username, DateTime since,
-                                              int startIndex = 0,
-                                              int endIndex = LastFm.DefaultPageLength);
+            int startIndex = 0,
+            int endIndex = LastFm.DefaultPageLength);
 
-        Task<PageResponse<Station>> GetRecentStations(int pagenumber, int count = LastFm.DefaultPageLength);
+        Task<PageResponse<Station>> GetRecentStations(int pagenumber,
+            int count = LastFm.DefaultPageLength);
     }
 }
\ No newline at end of file
diff --git a/IF.Lastfm.Core/Api/UserApi.cs b/IF.Lastfm.Core/Api/UserApi.cs
index 37add49..4e90306 100644
--- a/IF.Lastfm.Core/Api/UserApi.cs
+++ b/IF.Lastfm.Core/Api/UserApi.cs
@@ -22,15 +22,16 @@ public UserApi(IAuth auth)
         }
 
         /// <summary>
-        /// TODO paging
+        /// Gets the top albums for the given user.
         /// </summary>
+        /// <param name="username"></param>
         /// <param name="span"></param>
-        /// <param name="startIndex"></param>
-        /// <param name="amount"></param>
+        /// <param name="pagenumber"></param>
+        /// <param name="count"></param>
         /// <returns></returns>
-        public async Task<PageResponse<Album>> GetTopAlbums(LastStatsTimeSpan span, int pagenumber = 0, int count = LastFm.DefaultPageLength)
+        public async Task<PageResponse<Album>> GetTopAlbums(string username, LastStatsTimeSpan span, int pagenumber = 0, int count = LastFm.DefaultPageLength)
         {
-            var command = new GetTopAlbumsCommand(Auth, Auth.User.Username, span)
+            var command = new GetTopAlbumsCommand(Auth, username, span)
                           {
                               Page = pagenumber,
                               Count = count
@@ -45,7 +46,7 @@ public async Task<PageResponse<Album>> GetTopAlbums(LastStatsTimeSpan span, int
         /// <param name="username"></param>
         /// <param name="since"></param>
         /// <param name="pagenumber"></param>
-        /// <param name="endIndex"></param>
+        /// <param name="count"></param>
         /// <returns></returns>
         public async Task<PageResponse<Track>> GetRecentScrobbles(string username, DateTime since, int pagenumber = 0, int count = LastFm.DefaultPageLength)
         {