diff --git a/app/Http/Controllers/Api/Web/AccountController.php b/app/Http/Controllers/Api/Web/AccountController.php
index 53739d9a..70173f57 100644
--- a/app/Http/Controllers/Api/Web/AccountController.php
+++ b/app/Http/Controllers/Api/Web/AccountController.php
@@ -34,6 +34,7 @@ class AccountController extends ApiControllerBase
         $user = Auth::user();
 
         return Response::json([
+            'id'  => $user->id,
             'bio' => $user->bio,
             'can_see_explicit_content' => $user->can_see_explicit_content == 1,
             'display_name' => $user->display_name,
diff --git a/public/templates/account/album.html b/public/templates/account/album.html
index f5867312..d2836506 100644
--- a/public/templates/account/album.html
+++ b/public/templates/account/album.html
@@ -22,7 +22,7 @@
         </div>
         <div class="form-row" ng-class="{'has-error': errors.cover != null}">
             <label class="strong">Album Cover: </label>
-            <pfm-image-upload set-image="setCover" image="album.cover" />
+            <pfm-image-upload set-image="setCover" image="album.cover" user-id="album.user_id"></pfm-image-upload>
         </div>
         <div class="form-row track-selector">
             <a pfm-popup="track-selector,right" pfm-popup-close-on-click href="#" class="btn btn-small pull-right btn-info">Add Tracks</a>
diff --git a/public/templates/account/settings.html b/public/templates/account/settings.html
index ca8269c4..6f5ad35d 100644
--- a/public/templates/account/settings.html
+++ b/public/templates/account/settings.html
@@ -27,7 +27,7 @@
                 <input ng-change="touchModel()" ng-disabled="isLoading" id="uses_gravatar" type="checkbox" ng-model="settings.uses_gravatar" /> Use Gravatar
             </label>
             <div ng-show="!settings.uses_gravatar">
-                <pfm-image-upload set-image="setAvatar" image="settings.avatar_url" />
+                <pfm-image-upload set-image="setAvatar" image="settings.avatar_url" user-id="settings.id"></pfm-image-upload>
             </div>
             <input type="text" ng-disabled="isSaving" ng-change="touchModel()" ng-show="settings.uses_gravatar" placeholder="Gravatar Email" ng-model="settings.gravatar" />
             <div class="error" ng-show="errors.avatar != null">{{errors.avatar}}</div>
diff --git a/resources/assets/scripts/app/controllers/account-albums-edit.coffee b/resources/assets/scripts/app/controllers/account-albums-edit.coffee
index b8dd052b..346c0c47 100644
--- a/resources/assets/scripts/app/controllers/account-albums-edit.coffee
+++ b/resources/assets/scripts/app/controllers/account-albums-edit.coffee
@@ -139,6 +139,7 @@ module.exports = angular.module('ponyfm').controller "account-albums-edit", [
             albums.getEdit($state.params.album_id).done (album) ->
                 $scope.album =
                     id: album.id
+                    user_id: album.user_id
                     title: album.title
                     description: album.description
                     remove_cover: false
diff --git a/resources/assets/scripts/app/controllers/account-albums.coffee b/resources/assets/scripts/app/controllers/account-albums.coffee
index 877f14b1..d811dad4 100644
--- a/resources/assets/scripts/app/controllers/account-albums.coffee
+++ b/resources/assets/scripts/app/controllers/account-albums.coffee
@@ -15,9 +15,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 window.pfm.preloaders['account-albums'] = [
-    'account-tracks', 'account-albums'
-    (tracks, albums) ->
-        $.when.all [tracks.refresh('published=true&in_album=false', true), albums.refresh(true)]
+    'account-tracks'
+    (tracks) ->
+        tracks.refresh('published=true&in_album=false', true)
 ]
 
 module.exports = angular.module('ponyfm').controller "account-albums", [